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..c9a8425fb 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,10 @@ public interface RemoteOpenService { /**获取流程信息**/ - @GetMapping("/openInterface/GetOaNodeInfo") - public AjaxResult GetOaNodeInfo(@RequestParam("requestId") String requestId); + @GetMapping("/openInterface/GetOaNodeInfo/{requestid}") + public AjaxResult GetOaNodeInfo(@PathVariable("requestid") String requestId); + + /**获取HR人员信息**/ + @GetMapping("/openInterface/GetHrUserInfo") + public AjaxResult GetHrUserInfo(@PathVariable("dateTime") String dateTime); } 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..48f8fe0ef 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,9 +26,14 @@ public class RemoteOpenFallbackFactory implements FallbackFactory rlist = mesReportWorkConsumeService.getBomList(mesReportWorkConsume); + return rlist; + } } 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 8e25229d3..7d218a9d8 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 @@ -70,7 +70,6 @@ public class MesReportWorkController extends BaseController { List hzlist = mesReportWorkService.getReportWorkHzList(mesReportWork); return getDataTable(hzlist); } - /** * 导出报工报表列表 */ @@ -88,6 +87,15 @@ public class MesReportWorkController extends BaseController { // mesReportWork.setCreateTimeEnd(dateEndStr);//end // } List list = mesReportWorkService.selectMesReportWorkList_S(mesReportWork); + for(MesReportWork dto:list){ + if("1".equals(dto.getUploadStatus())){ + dto.setUploadStatus("sap报工成功"); + }else if("2".equals(dto.getUploadStatus())){ + dto.setUploadStatus("sap报工失败"); + }else if("0".equals(dto.getUploadStatus())){ + dto.setUploadStatus("待报工sap"); + } + } ExcelUtil util = new ExcelUtil(MesReportWork.class); util.exportExcel(response, list, "报工报表数据"); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java new file mode 100644 index 000000000..a015bce3a --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java @@ -0,0 +1,33 @@ +package com.op.mes.controller; + +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.page.TableDataInfo; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.mes.domain.MesReportWork; +import com.op.mes.service.IMesReportWorksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static com.op.common.core.utils.PageUtils.startPage; + +@RestController +@RequestMapping("/reportWorks") +public class MesReportWorksController extends BaseController { + @Autowired + private IMesReportWorksService mesReportWorksService; + + /** + * 产线报工 + */ + @RequiresPermissions("mes:reportWork:lists") + @GetMapping("/lists") + public TableDataInfo lists(MesReportWork mesReportWork) { + startPage(); + List hzlist = mesReportWorksService.getReportWorksList(mesReportWork); + return getDataTable(hzlist); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java new file mode 100644 index 000000000..6ebc7877f --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java @@ -0,0 +1,10 @@ +package com.op.mes.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/unitPriceReport") +public class MesUnitPriceReportController { + +} 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 010e2284e..bc45ed0da 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 @@ -220,6 +220,15 @@ public class MesReportWork extends BaseEntity { private Long workTimes; private String workCenter; private String shiftId; + private String keywords; + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } private List consumesInfos; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java index d1a1d7fb1..597b5c834 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java @@ -72,6 +72,79 @@ public class MesReportWorkConsume extends BaseEntity { private String parentOrder; private String batch; private String recoil; + private String standardDosage; + private String lossRate; + private String lossAmount; + private String cilosses; + private String sanka; + private String productGroup; + private String productGroupName; + //上级物料 + private String pMaterialCode; + + public String getpMaterialCode() { + return pMaterialCode; + } + + public void setpMaterialCode(String pMaterialCode) { + this.pMaterialCode = pMaterialCode; + } + + public String getProductGroup() { + return productGroup; + } + + public void setProductGroup(String productGroup) { + this.productGroup = productGroup; + } + + public String getProductGroupName() { + return productGroupName; + } + + public void setProductGroupName(String productGroupName) { + this.productGroupName = productGroupName; + } + + public String getStandardDosage() { + return standardDosage; + } + + public void setStandardDosage(String standardDosage) { + this.standardDosage = standardDosage; + } + + public String getLossRate() { + return lossRate; + } + + public void setLossRate(String lossRate) { + this.lossRate = lossRate; + } + + public String getLossAmount() { + return lossAmount; + } + + public void setLossAmount(String lossAmount) { + this.lossAmount = lossAmount; + } + + public String getCilosses() { + return cilosses; + } + + public void setCilosses(String cilosses) { + this.cilosses = cilosses; + } + + public String getSanka() { + return sanka; + } + + public void setSanka(String sanka) { + this.sanka = sanka; + } public String getRecoil() { return recoil; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java index b349ef97b..410ed0f39 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java @@ -77,4 +77,6 @@ public interface MesReportWorkConsumeMapper { int addConsumePS(@Param("list")List rconsumes); List getSonConsumeList(MesReportWorkConsume mesReportWorkConsume); + + List getBomList(MesReportWorkConsume mesReportWorkConsume); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorksMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorksMapper.java new file mode 100644 index 000000000..0ce62aecb --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorksMapper.java @@ -0,0 +1,15 @@ +package com.op.mes.mapper; + + +import com.op.mes.domain.MesReportWork; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface MesReportWorksMapper { + + List getReportWorkList(MesReportWork mesReportWork); + + +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java index 1d08ed5ff..5fac59544 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java @@ -21,6 +21,8 @@ public interface MesUnitPriceMapper { */ public MesUnitPrice selectMesUnitPriceByPicId(String picId); + public MesUnitPrice selectMesUnitPriceByProCode(MesUnitPrice mesUnitPrice); + /** * 查询unitPrice列表 * diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java index b3c49ded9..e2d134c2d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java @@ -82,4 +82,6 @@ public interface IMesReportWorkConsumeService { int submitConsumePS(List mesReportWorkConsume); int submitReportInfo(MesReportWork mesReportWork); + + List getBomList(MesReportWorkConsume mesReportWorkConsume); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java new file mode 100644 index 000000000..bf0095510 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java @@ -0,0 +1,11 @@ +package com.op.mes.service; + +import com.op.mes.domain.MesReportWork; + +import java.util.List; + +public interface IMesReportWorksService { + + List getReportWorksList(MesReportWork mesReportWork); + +} 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 f63e76c43..70d03ff18 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 @@ -380,6 +380,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { List lt_hwList =new ArrayList<>(); MesReportWorkConsume consumeqo = new MesReportWorkConsume(); consumeqo.setWorkorderCode(workOrder.getWorkorderCode()); + consumeqo.setRecoil("X"); List consumes = mesReportWorkConsumeMapper.selectMesReportWorkConsumeList(consumeqo); if(!CollectionUtils.isEmpty(consumes)){ for(MesReportWorkConsume consume:consumes){ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 4cb75a1f9..b3adfb61e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -252,4 +252,11 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer } return rconsumes; } + + @Override + @DS("#header.poolName") + public List getBomList(MesReportWorkConsume mesReportWorkConsume) { + List dtos = mesReportWorkConsumeMapper.getBomList(mesReportWorkConsume); + return dtos; + } } 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 95c6a72c6..d0cf34fcb 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 @@ -133,15 +133,15 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { @DS("#header.poolName") public List getReportWorkHzList(MesReportWork mesReportWork) { List dtos = mesReportWorkMapper.getReportWorkHzList(mesReportWork); - for(MesReportWork dto:dtos){ - if("1".equals(dto.getUploadStatus())){ - dto.setUploadStatus("sap报工成功"); - }else if("2".equals(dto.getUploadStatus())){ - dto.setUploadStatus("sap报工失败"); - }else if("0".equals(dto.getUploadStatus())){ - dto.setUploadStatus("待报工sap"); - } - } +// for(MesReportWork dto:dtos){ +// if("1".equals(dto.getUploadStatus())){ +// dto.setUploadStatus("sap报工成功"); +// }else if("2".equals(dto.getUploadStatus())){ +// dto.setUploadStatus("sap报工失败"); +// }else if("0".equals(dto.getUploadStatus())){ +// dto.setUploadStatus("待报工sap"); +// } +// } return dtos; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java new file mode 100644 index 000000000..404e34c18 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java @@ -0,0 +1,24 @@ +package com.op.mes.service.impl; + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.mes.domain.MesReportWork; +import com.op.mes.mapper.MesReportWorksMapper; +import com.op.mes.service.IMesReportWorksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MesReportWorksServiceImpl implements IMesReportWorksService { + + @Autowired + private MesReportWorksMapper mesReportWorksMapper; + + @Override + @DS("#header.poolName") + public List getReportWorksList(MesReportWork mesReportWork) { + return mesReportWorksMapper.getReportWorkList(mesReportWork); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java index 3015610c0..90cdea918 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.exception.ServiceException; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; +import com.op.common.core.utils.bean.BeanValidators; import com.op.common.core.utils.uuid.IdUtils; import com.op.mes.domain.MesUnitPrice; import com.op.mes.mapper.MesUnitPriceMapper; @@ -15,6 +16,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.Validator; + /** * unitPriceService业务层处理 @@ -30,6 +33,9 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { @Autowired private MesUnitPriceMapper mesUnitPriceMapper; + @Autowired + protected Validator validator; + /** * 查询unitPrice @@ -38,6 +44,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { * @return unitPrice */ @Override + @DS("#header.poolName") public MesUnitPrice selectMesUnitPriceByPicId(String picId) { return mesUnitPriceMapper.selectMesUnitPriceByPicId(picId); } @@ -73,6 +80,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { * @return 结果 */ @Override + @DS("#header.poolName") public int updateMesUnitPrice(MesUnitPrice mesUnitPrice) { mesUnitPrice.setUpdateTime(DateUtils.getNowDate()); return mesUnitPriceMapper.updateMesUnitPrice(mesUnitPrice); @@ -104,7 +112,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { @DS("#header.poolName") public String importMesUnitPrice(List UnitPriceList, Boolean updateSupport, String operName) { if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) { - throw new ServiceException("导入数据不能为空！"); + throw new ServiceException("导入用户数据不能为空！"); } int successNum = 0; int failureNum = 0; @@ -112,15 +120,22 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { StringBuilder failureMsg = new StringBuilder(); for (MesUnitPrice mesUnitPrice : UnitPriceList) { try { - // 验证是否存在这个产线产品 - mesUnitPrice.setPicId(IdUtils.simpleUUID()); - mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); - successNum++; - successMsg.append("导入成功"); - + // 验证是否存在这个产品的单价信息 + MesUnitPrice u=mesUnitPriceMapper.selectMesUnitPriceByProCode(mesUnitPrice); + if (StringUtils.isNull(u)) { + BeanValidators.validateWithException(validator, mesUnitPrice); + mesUnitPrice.setPicId(IdUtils.simpleUUID()); + mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); + successNum++; + successMsg.append("
" + successNum + mesUnitPrice.getProductName()+"-"+mesUnitPrice.getChildprocessName() + " 导入成功"); + } + else { + failureNum++; + failureMsg.append("
" + failureNum + "、产品 " + mesUnitPrice.getProductName() + " 已存在"); + } } catch (Exception e) { failureNum++; - String msg = "导入失败："; + String msg = "
" + failureNum + "、产品 " + mesUnitPrice.getProductName() + " 导入失败："; failureMsg.append(msg + e.getMessage()); log.error(msg, e); } @@ -132,5 +147,34 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); } return successMsg.toString(); +// if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) { +// throw new ServiceException("导入数据不能为空！"); +// } +// int successNum = 0; +// int failureNum = 0; +// StringBuilder successMsg = new StringBuilder(); +// StringBuilder failureMsg = new StringBuilder(); +// for (MesUnitPrice mesUnitPrice : UnitPriceList) { +// try { +// // 验证是否存在这个产线产品 +// mesUnitPrice.setPicId(IdUtils.simpleUUID()); +// mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); +// successNum++; +// successMsg.append("导入成功"); +// +// } catch (Exception e) { +// failureNum++; +// String msg = "导入失败："; +// failureMsg.append(msg + e.getMessage()); +// log.error(msg, e); +// } +// } +// if (failureNum > 0) { +// failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); +// throw new ServiceException(failureMsg.toString()); +// } else { +// successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); +// } +// return successMsg.toString(); } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesRWMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesRWMapper.xml new file mode 100644 index 000000000..1ad46c2d8 --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesRWMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 588831934..20c6b2e19 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and attr3 = #{attr3} and attr4 = #{attr4} and factory_code = #{factoryCode} + and recoil = #{recoil} and del_flag = '0' @@ -109,6 +110,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where mrwc.del_flag = '0' and pow.del_flag = '0' and pow.parent_order = #{workorderCode} + insert into mes_report_work_consume 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 fb4dd409d..b42d86776 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 @@ -493,13 +493,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" shift_code shiftCode, sum(quantity_feedback) quantityFeedback, sum(work_time) workTime, - sum(use_man) useMan, + use_man useMan, upload_status uploadStatus, upload_time uploadTime, upload_msg uploadMsg, unit from mes_report_work where del_flag = '0' and parent_order = '0' + and workorder_code like concat('%', #{workorderCode}, '%') and workorder_code like concat('%', #{workorderCode}, '%') and product_code like concat('%', #{productCode}, '%') and product_name like concat('%', #{productName}, '%') @@ -507,12 +508,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and machine_name like concat('%', #{machineName}, '%') and upload_status = #{uploadStatus} group by workorder_code, product_code,product_name,machine_code,machine_name,shift_code - ,upload_status,unit + ,upload_status,unit,use_man ,upload_time,upload_msg ) mrw left join pro_order_workorder pow on mrw.workorderCode = pow.workorder_code pow.del_flag = '0' + + and pow.order_code like concat('%', #{keywords}, '%') or + pow.workorder_code_sap like concat('%', #{keywords}, '%') or + mrw.productCode like concat('%', #{keywords}, '%') + and pow.product_date >= #{feedbackTimeStart} and #{feedbackTimeEnd} >= pow.product_date and pow.order_code like concat('%', #{orderCode}, '%') @@ -818,7 +824,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" upload_time = null, upload_status = '0', upload_msg = null - where workorder_code = #{workorderCode} + where workorder_code = #{workorderCode} or parent_order = #{workorderCode} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml index c79b86c57..f085ac3e3 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml @@ -52,6 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where pic_id = #{picId} + insert into mes_unit_price 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 eec938c2f..d86bb25ec 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,14 +1,12 @@ 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.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -90,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)); } @@ -147,15 +140,24 @@ public class OpenController extends BaseController { /** * 获取流程节点 - * @param requestId + * @param requestid * @return */ - @GetMapping("/GetOaNodeInfo") - public AjaxResult GetOaNodeInfo(@RequestParam("requestId") String requestId) { - return openService.GetOaNodeInfo(requestId); + @GetMapping("/GetOaNodeInfo/{requestid}") + public AjaxResult GetOaNodeInfo(@PathVariable("requestid") String requestid) { + return openService.GetOaNodeInfo(requestid); + } + + /** + * 获取HR人员信息 + * dateTime :"2024-01-05" + * @param dateTime + * @return + */ + @GetMapping("/GetHrUserInfo") + public AjaxResult GetHrUserInfo(@RequestParam("dateTime") String dateTime) { + return openService.GetHrUserInfo(dateTime); } - - } 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..18fcd985a 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 @@ -32,4 +32,6 @@ public interface OpenService { AjaxResult OAInspection(Map paramMap); AjaxResult GetOaNodeInfo(String requestId); + + AjaxResult GetHrUserInfo(String dateTime); } 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 c510be45e..1d9d67cfc 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 @@ -75,6 +75,9 @@ public class OpenServiceImpl implements OpenService { @Value("${OA.getnodeInfo}") private String getnodeInfo; + @Value("${HR.url}") + private String hr_url; + @Autowired private OpenMapper openMapper; @@ -359,6 +362,7 @@ public class OpenServiceImpl implements OpenService { user.setCreateTime(nowDate); } } + /**qc_check_task_user**/ int m = openMapper.addCheckUsers(users); logger.info("检查人新增" + m + "成功"); @@ -389,6 +393,8 @@ public class OpenServiceImpl implements OpenService { qcCheckTaskProduce.setIncomeTime(qcCheckTaskProduce.getProduceDate()); qcCheckTaskProduce.setSupplierCode(qcCheckTaskProduce.getCarCode()); qcCheckTaskProduce.setSupplierName(qcCheckTaskProduce.getCarName()); + qcCheckTaskProduce.setCheckManName(null); + qcCheckTaskProduce.setCheckManCode(null); openMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); /**qc_check_task_detail**/ for (QcCheckTaskDetailDTO item : items) { @@ -411,7 +417,7 @@ public class OpenServiceImpl implements OpenService { String requestName = paramMap.get("requestName").toString(); String workflowId = paramMap.get("workflowId").toString(); String mainObject = paramMap.get("mainObject").toString(); - String details = paramMap.get("details").toString(); + // Building the postData string using StringBuilder StringBuilder postDataBuilder = new StringBuilder(); @@ -421,11 +427,12 @@ public class OpenServiceImpl implements OpenService { .append("&workflowId=").append(workflowId) .append("&mainObject=").append(URLEncoder.encode(mainObject, StandardCharsets.UTF_8.toString())); if (Constants.WORKFLOWID_ZL0020.equals(workflowId)) { + String details = paramMap.get("details").toString(); postDataBuilder.append("&details=").append(URLEncoder.encode(details, StandardCharsets.UTF_8.toString())); } String postData = postDataBuilder.toString(); String result = HttpUtils.sendPostOA(oa_url, postData); - System.out.println(result); + logger.info(result); //返回示例{"result":"0","info":"成功","requestid":"2193799"} Map resultMap=JSONObject.parseObject(result); if (resultMap.get("result").equals(Constants.LOGIN_SUCCESS_STATUS)){ @@ -454,4 +461,16 @@ public class OpenServiceImpl implements OpenService { } } + @Override + public AjaxResult GetHrUserInfo(String dateTime) { + try { + StringBuilder postDataBuilder = new StringBuilder(); + postDataBuilder.append("createTime=").append("dateTime"); + String result = HttpUtils.sendPost(hr_url,postDataBuilder.toString()); + return success(result); + } catch (Exception e) { + e.printStackTrace(); + return error(e.getMessage()); + } + } } diff --git a/op-modules/op-open/src/main/resources/bootstrap.yml b/op-modules/op-open/src/main/resources/bootstrap.yml index f032dd8bc..b9dd2cae6 100644 --- a/op-modules/op-open/src/main/resources/bootstrap.yml +++ b/op-modules/op-open/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test #命名空间 #group: local # 配置中心地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 34be5801b..9bd51bca7 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -133,7 +133,7 @@ public interface ProOrderWorkorderMapper { List selectProOrderWorkerderByWorkerIds(String[] ids); - public void updateWorkOrderCodeSap(ProOrderWorkorder oworkSap); + public int updateWorkOrderCodeSap(ProOrderWorkorder oworkSap); /** * 通过工艺code查询工艺名称 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index f0763aa65..b6ab006d8 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -288,7 +288,7 @@ public class ProOrderServiceImpl implements IProOrderService { BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity()) .subtract(new BigDecimal(proOrder.getQuantitySplit())); sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量 - logger.info("母订单"+proOrder.getOrderCode()+ + logger.info("【成品订单拆分】母订单"+proOrder.getOrderCode()+ "订单数量变更：修改前"+proOrder.getQuantity()+","+ ",已拆数量"+proOrder.getQuantitySplit()+","+ "给sap汇报数量"+newSapQuantityNum.toString()); @@ -302,7 +302,7 @@ public class ProOrderServiceImpl implements IProOrderService { workOrder.setBelongWorkOrder(belongWorkOrder); workOrder.setProdType("LJ01"); - // 将工单信息更新至数据库 + // 将工单信息更新至数据库/**pro_order_workorder**/ proOrderWorkorderMapper.insertProOrderWorkorder(workOrder); // 生成批次表信息并更新至数据库 setBatch(workBatch, splitOrderDTO.getFormFields(), workOrder.getWorkorderId(), conver); @@ -940,7 +940,7 @@ public class ProOrderServiceImpl implements IProOrderService { // 拆分中 proOrder.setStatus("o1"); } - // 更新订单表 + // 更新订单表/**pro_order**/ proOrderMapper.updateOrder(proOrder); // 生成对应的工单表 // 生成id diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 16dbb893b..453791066 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -320,8 +320,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { R>> r = remoteSapService.SapCreateOrder(sapList); logger.info("sap工单回传：" + r.getMsg()); if (500 == r.getCode()) { - logger.error("sap工单回传：(sap订单创建)" + r.getMsg()); + logger.error("工单派发sap工单回传：(sap订单创建失败)" + r.getMsg()); return 0; + }else{ + logger.info("工单派发sap工单回传：(sap订单创建成功)" + JSONObject.toJSONString(r)); } List> returnMaps = r.getData(); List returnCodes = new ArrayList<>(); @@ -339,27 +341,23 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { oworkSap.setWorkorderId(wcodes.get(m));//工单编码 oworkSap.setUpdateTime(updateTime); /**pro_order_workorder**/ - proOrderWorkorderMapper.updateWorkOrderCodeSap(oworkSap); + int n = proOrderWorkorderMapper.updateWorkOrderCodeSap(oworkSap); + logger.info("工单派发pro_order_workorder："+n); } } -//测试 -// List returnCodes = new ArrayList<>(); -// returnCodes.add("000100305879"); -// returnCodes.add("000100305878"); - //获取领料单 this.getMesPrepare(returnCodes,wcodes); - //关闭母子订单//订单的订单编码 - SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery(); - sapCloseOrderQuery.setLeadOrder(ordercodes.get(0)); - sapCloseOrderQuery.setOrder(ordercodes.get(1)); - R closeR= remoteSapService.sapCloseOrder(sapCloseOrderQuery); - logger.info(whiteOrder.getWorkorderCode()+"下发工单后关闭母订单"+sapCloseOrderQuery.getLeadOrder()+":"+ - sapCloseOrderQuery.getOrder()+":"+ - closeR.getCode()+","+ - closeR.getMsg()+","+ - closeR.getData()); +// //关闭母子订单//订单的订单编码(关闭订单暂时隐藏) +// SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery(); +// sapCloseOrderQuery.setLeadOrder(ordercodes.get(0)); +// sapCloseOrderQuery.setOrder(ordercodes.get(1)); +// R closeR= remoteSapService.sapCloseOrder(sapCloseOrderQuery); +// logger.info(whiteOrder.getWorkorderCode()+"下发工单后关闭母订单"+sapCloseOrderQuery.getLeadOrder()+":"+ +// sapCloseOrderQuery.getOrder()+":"+ +// closeR.getCode()+","+ +// closeR.getMsg()+","+ +// closeR.getData()); //下达工单 String[] idsArrayAll = (String[])wids.toArray(new String[wids.size()]); proOrderWorkorderMapper.downWorkorders(idsArrayAll); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 79a1df96f..f49debde1 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -68,8 +68,8 @@ and pow.workorder_name like concat('%', #{workorderName}, '%') and pow.order_id = #{orderId} and pow.order_code like concat('%', #{orderCode}, '%') - and pow.product_code like concat('%', #{productCode}, '%') - and pow.product_name like concat('%', #{productName}, '%') + and ppow.product_code like concat('%', #{productCode}, '%') + and ppow.product_name like concat('%', #{productName}, '%') and pow.product_date = #{productDate} and pow.shift_id = #{shiftId} and pow.parent_order = #{parentOrder} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java index eed07714f..1239b3418 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java @@ -39,7 +39,7 @@ public class QcCheckReportInventoryController extends BaseController { /** * 查询来料检验列表 */ - @RequiresPermissions("quality:incomeReport:list") + @RequiresPermissions("quality:inventoryReport:list") @GetMapping("/list") public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { @@ -66,7 +66,7 @@ public class QcCheckReportInventoryController extends BaseController { /** * 导出来料检验列表 */ - @RequiresPermissions("quality:incomeReport:export") + @RequiresPermissions("quality:inventoryReport:export") @Log(title = "来料检验", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) { @@ -94,7 +94,7 @@ public class QcCheckReportInventoryController extends BaseController { /** * 获取来料检验详细信息 */ - @RequiresPermissions("quality:incomeReport:query") + @RequiresPermissions("quality:inventoryReport:query") @GetMapping(value = "/{recordId}") public AjaxResult getInfo(@PathVariable("recordId") String recordId) { return success(qcCheckReportInventoryService.selectQcCheckReportIncomeByRecordId(recordId)); @@ -103,7 +103,6 @@ public class QcCheckReportInventoryController extends BaseController { /** * 新增来料检验 */ - @RequiresPermissions("quality:incomeReport:add") @Log(title = "来料检验", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody QcCheckReportIncome qcCheckReportIncome) { @@ -117,7 +116,6 @@ public class QcCheckReportInventoryController extends BaseController { /** * 修改来料检验 */ - @RequiresPermissions("quality:incomeReport:edit") @Log(title = "来料检验", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody QcCheckReportIncome qcCheckReportIncome) { @@ -127,7 +125,6 @@ public class QcCheckReportInventoryController extends BaseController { /** * 删除来料检验 */ - @RequiresPermissions("quality:incomeReport:remove") @Log(title = "来料检验", businessType = BusinessType.DELETE) @DeleteMapping("/{recordIds}") public AjaxResult remove(@PathVariable String[] recordIds) { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java index aa9aafc6b..1f35b6ca5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java @@ -40,15 +40,15 @@ public class QcCheckReportProduceController extends BaseController { @GetMapping("/list") public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ - qcCheckReportIncome.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"; - qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ +// qcCheckReportIncome.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"; +// qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end +// } startPage(); List list = qcCheckReportProduceService.selectQcCheckReportIncomeList(qcCheckReportIncome); @@ -63,15 +63,15 @@ public class QcCheckReportProduceController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){ - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){ +// qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; +// qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start @@ -181,4 +181,15 @@ public class QcCheckReportProduceController extends BaseController { QcCheckTaskProduce dto = qcCheckReportProduceService.getProduceReportXJ(qcCheckTaskProduce); return dto; } + // 生产过程报告任务详情 + @PostMapping("/getTaskInfo") + public QcCheckReportIncome getTaskInfo(@RequestBody QcCheckReportIncome qcCheckReportIncome) { + QcCheckReportIncome dto = qcCheckReportProduceService.getTaskInfo(qcCheckReportIncome); + return dto; + } + + @PostMapping("/submitConfirm") + public AjaxResult submitConfirm(@RequestBody QcCheckReportIncome qcCheckReportIncome) { + return toAjax(qcCheckReportProduceService.submitConfirm(qcCheckReportIncome)); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index cdf0aa792..20a5df328 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -135,6 +135,34 @@ public class QcCheckTaskIncomeController extends BaseController { public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome0) { QcCheckTaskIncome qcCheckTaskIncome = new QcCheckTaskIncome(); BeanUtils.copyProperties(qcCheckTaskIncome0,qcCheckTaskIncome); + + if(StringUtils.isBlank(qcCheckTaskIncome.getOrderNo())){ + return error("[orderNo]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getMaterialName())){ + return error("[materialName]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getMaterialCode())){ + return error("[materialCode]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getCheckType())){ + return error("[checkType]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getFactoryCode())){ + return error("[factoryCode]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getSupplierCode())){ + return error("[supplierCode]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getSupplierName())){ + return error("[supplierName]不能为空"); + } + if(qcCheckTaskIncome.getIncomeTime()==null){ + return error("[incomeTime]不能为空"); + } + logger.info("来料检验任务生成开始================================"); + logger.info("来料检验任务生成参数："+ JSONObject.toJSONString(qcCheckTaskIncome)); + int r = qcCheckTaskIncomeService.insertQcCheckTaskIncome(qcCheckTaskIncome); if(r>0){ return toAjax(r); @@ -237,7 +265,7 @@ public class QcCheckTaskIncomeController extends BaseController { public AjaxResult commitCheckResult(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { qcCheckTaskIncome.setUpdateBy(SecurityUtils.getUsername()); qcCheckTaskIncome.setUpdateTime(DateUtils.getNowDate()); - return toAjax(qcCheckTaskIncomeService.commitCheckResult(qcCheckTaskIncome)); + return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } /**不良类型**/ @@ -273,4 +301,16 @@ public class QcCheckTaskIncomeController extends BaseController { public List getBatchList(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { return qcCheckTaskIncomeService.getBatchList(qcCheckTaskIncome); } + + /** + * 订单巡检任务专用列表 + * @param + * @return + */ + @GetMapping("/getCkeckProjectXJList") + public TableDataInfo getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome) { + startPage(); + List list = qcCheckTaskIncomeService.getCkeckProjectXJList(qcCheckTaskIncome); + return getDataTable(list); + } } 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 8be779569..108e66702 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 @@ -1,12 +1,9 @@ package com.op.quality.controller; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.op.common.core.utils.DateUtils; -import org.apache.commons.lang.StringUtils; +import com.op.system.api.domain.quality.OAInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -120,4 +117,14 @@ public class QcCheckUnqualifiedController extends BaseController { public AjaxResult remove(@PathVariable String[] ids) { return toAjax(qcCheckUnqualifiedService.deleteQcCheckUnqualifiedByIds(ids)); } + + /** + * 查询oa审批流程列表 + */ + @RequiresPermissions("quality:unqualified:list") + @GetMapping("/getOAInfoList") + public List 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/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java index a4ab70348..65d757881 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java @@ -313,4 +313,13 @@ public class QcStaticTableController extends BaseController { util.exportExcel(response, list, "质检不良统计"); } + /**定量值分析--表头--产品名称**/ + @GetMapping("/getDLTableAvgInfo") + public QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable) { + return qcStaticTableService.getDLTableAvgInfo(qcStaticTable); + } + @GetMapping("/getDLDetailList") + public List getDLDetailList(QcStaticTable qcStaticTable) { + return qcStaticTableService.getDLDetailList(qcStaticTable); + } } 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..4303edf4f 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,97 @@ public class QcCheckReportIncome extends BaseEntity { private String checkType;//小类 private String checkName; private String createTimeStr; + private List files; + private List fileUrls; + private String reason; + private String productType; + private String confirm; + private String confirmManCode; + private String confirmManName; + private String confirmRemark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date confirmTime; + private Boolean myself; + + public Boolean getMyself() { + return myself; + } + + public void setMyself(Boolean myself) { + this.myself = myself; + } + + public Date getConfirmTime() { + return confirmTime; + } + + public void setConfirmTime(Date confirmTime) { + this.confirmTime = confirmTime; + } + + public String getConfirmRemark() { + return confirmRemark; + } + + public void setConfirmRemark(String confirmRemark) { + this.confirmRemark = confirmRemark; + } + + public String getConfirm() { + return confirm; + } + + public void setConfirm(String confirm) { + this.confirm = confirm; + } + + public String getConfirmManCode() { + return confirmManCode; + } + + public void setConfirmManCode(String confirmManCode) { + this.confirmManCode = confirmManCode; + } + + public String getConfirmManName() { + return confirmManName; + } + + public void setConfirmManName(String confirmManName) { + this.confirmManName = confirmManName; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + public String getProductType() { + return productType; + } + + public void setProductType(String productType) { + this.productType = productType; + } + + 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/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index 67d5a108f..ee082dcd3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -98,6 +98,15 @@ public class QcCheckTaskDetail extends BaseEntity { private String checkType; private String fileListStr; private List files; + private List fileUrls; + + public List getFileUrls() { + return fileUrls; + } + + public void setFileUrls(List fileUrls) { + this.fileUrls = fileUrls; + } @Override public String getRemark() { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index e51f28c60..9f10f97e3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -142,6 +142,24 @@ public class QcCheckTaskIncome extends BaseEntity { private String remark; private String belongTo; private String oldBelongTo; + private String noOkQualityNames; + private String noOkQualityVals; + + public String getNoOkQualityNames() { + return noOkQualityNames; + } + + public void setNoOkQualityNames(String noOkQualityNames) { + this.noOkQualityNames = noOkQualityNames; + } + + public String getNoOkQualityVals() { + return noOkQualityVals; + } + + public void setNoOkQualityVals(String noOkQualityVals) { + this.noOkQualityVals = noOkQualityVals; + } public String getOldBelongTo() { return oldBelongTo; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index 120227d3f..1daa776aa 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -150,6 +150,42 @@ public class QcCheckTaskProduce extends BaseEntity { private String checkName; private List checkInfos; private List defects; + private String reason; + private String productType; + private String confirmManCode; + private String confirmManName; + + public String getConfirmManCode() { + return confirmManCode; + } + + public void setConfirmManCode(String confirmManCode) { + this.confirmManCode = confirmManCode; + } + + public String getConfirmManName() { + return confirmManName; + } + + public void setConfirmManName(String confirmManName) { + this.confirmManName = confirmManName; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + public String getProductType() { + return productType; + } + + public void setProductType(String productType) { + this.productType = productType; + } public List getDefects() { return defects; 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/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java index cade73b8d..771fe3d85 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java @@ -8,6 +8,7 @@ import com.op.system.api.domain.quality.ChartSeriesDTO; import java.math.BigDecimal; import java.util.Date; +import java.util.HashMap; import java.util.List; /** @@ -99,6 +100,42 @@ public class QcStaticTable extends BaseEntity { private String startDateStr; private String endDateStr; private String checkType; + private List titleCol1; + private List titleCol2; + private List dxData; + private List details; + + public List getDetails() { + return details; + } + + public void setDetails(List details) { + this.details = details; + } + + public List getTitleCol1() { + return titleCol1; + } + + public void setTitleCol1(List titleCol1) { + this.titleCol1 = titleCol1; + } + + public List getTitleCol2() { + return titleCol2; + } + + public void setTitleCol2(List titleCol2) { + this.titleCol2 = titleCol2; + } + + public List getDxData() { + return dxData; + } + + public void setDxData(List dxData) { + this.dxData = dxData; + } public String getCheckType() { return checkType; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java index f70f798aa..c73f47c93 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java @@ -73,4 +73,13 @@ public interface QcCheckReportIncomeMapper { List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail); QcCheckTaskProduce getTopInfo(QcCheckTaskProduce qcCheckTaskProduce); + + QcCheckReportIncome getTaskInfo(QcCheckReportIncome qcCheckReportIncome); + + int submitConfirm(QcCheckReportIncome qcCheckReportIncome); + + QcCheckReportIncome getXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); + + QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); + QcCheckTaskProduce getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index 264f19abf..be6d5fd64 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -98,4 +98,8 @@ public interface QcCheckTaskIncomeMapper { List getDefectType(QcCheckTaskDetail qcCheckTaskDetail); QcCheckTaskIncome getTaskInfo(String recordId); + + int deleteQcCheckTaskDefects(String belongId); + + List getCkeckTaskXJList(QcCheckTaskIncome qcCheckTaskIncome); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java index 02a8e0628..8a94ee8fa 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java @@ -2,12 +2,13 @@ package com.op.quality.mapper; import java.util.List; +import com.op.quality.domain.QcCheckTaskIncome; import com.op.quality.domain.QcSampleRule; import org.apache.ibatis.annotations.Mapper; /** * 来料抽样规则Mapper接口 - * + * * @author Open Platform * @date 2023-12-28 */ @@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Mapper; public interface QcSampleRuleMapper { /** * 查询来料抽样规则 - * + * * @param id 来料抽样规则主键 * @return 来料抽样规则 */ @@ -23,7 +24,7 @@ public interface QcSampleRuleMapper { /** * 查询来料抽样规则列表 - * + * * @param qcSampleRule 来料抽样规则 * @return 来料抽样规则集合 */ @@ -31,7 +32,7 @@ public interface QcSampleRuleMapper { /** * 新增来料抽样规则 - * + * * @param qcSampleRule 来料抽样规则 * @return 结果 */ @@ -39,7 +40,7 @@ public interface QcSampleRuleMapper { /** * 修改来料抽样规则 - * + * * @param qcSampleRule 来料抽样规则 * @return 结果 */ @@ -47,7 +48,7 @@ public interface QcSampleRuleMapper { /** * 删除来料抽样规则 - * + * * @param id 来料抽样规则主键 * @return 结果 */ @@ -55,9 +56,11 @@ public interface QcSampleRuleMapper { /** * 批量删除来料抽样规则 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteQcSampleRuleByIds(String[] ids); + + String getSampNum(QcCheckTaskIncome qcCheckTaskIncome); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index 7d4cbc8b7..339555f9e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -62,4 +62,8 @@ public interface QcStaticTableMapper { List getLocList(); List getWorkcenter(); + @MapKey("recordId") + Map picsMap(QcStaticTable qcStaticTable); + + List getDLTableTitle(QcStaticTable qcStaticTable); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java index 587c4f618..eb82803e7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java @@ -71,4 +71,8 @@ public interface IQcCheckReportProduceService { List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail); QcCheckTaskProduce getProduceReportXJ(QcCheckTaskProduce qcCheckTaskProduce); + + QcCheckReportIncome getTaskInfo(QcCheckReportIncome qcCheckReportIncome); + + int submitConfirm(QcCheckReportIncome qcCheckReportIncome); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 981fb81d1..48a1a7bea 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -87,4 +87,6 @@ public interface IQcCheckTaskIncomeService { List getBatchList(QcCheckTaskIncome qcCheckTaskIncome); List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); + + List getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome); } 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/IQcStaticTableService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java index d60c07e39..151811eb4 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java @@ -43,4 +43,8 @@ public interface IQcStaticTableService { List getCheckTypeList(String typeCode); List getSupplierList(String typeCode); + + QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable); + + List getDLDetailList(QcStaticTable qcStaticTable); } 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..b69e7ef5b 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 @@ -9,6 +9,8 @@ import com.op.quality.mapper.*; import com.op.quality.service.IQcCheckReportProduceService; import com.op.quality.service.IQcStaticTableService; import com.op.system.api.domain.SysUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -27,6 +29,7 @@ import java.util.List; */ @Service public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceService { + protected Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private QcCheckReportIncomeMapper qcCheckReportIncomeMapper; @Autowired @@ -51,7 +54,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; } /** @@ -205,7 +209,62 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer qcStaticTable.setOrderNo(qcCheckTaskProduce.getOrderNo()); List checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); produce.setCheckInfos(checkInfos); + QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); + if(lastProduce != null ){ + produce.setProductType(lastProduce.getProductType()); + produce.setCheckManCode(lastProduce.getCheckManCode()); + produce.setCheckManName(lastProduce.getCheckManName()); + produce.setConfirmManCode(lastProduce.getConfirmManCode()); + produce.setConfirmManName(lastProduce.getConfirmManName()); + } return produce; } + @Override + @DS("#header.poolName") + public QcCheckReportIncome getTaskInfo(QcCheckReportIncome qcCheckReportIncome) { + QcCheckReportIncome taskInfo = null; + if("checkTypeSC".equals(qcCheckReportIncome.getCheckType())){ + taskInfo = qcCheckReportIncomeMapper.getTaskInfo(qcCheckReportIncome); + + }else if("checkTypeSCXJ".equals(qcCheckReportIncome.getCheckType())){ + taskInfo = qcCheckReportIncomeMapper.getXJTaskInfo(qcCheckReportIncome); + //最后一条巡检记录得确认人当最终确认人 + QcCheckReportIncome lastData = qcCheckReportIncomeMapper.getLastXJTaskInfo(qcCheckReportIncome); + if(lastData!=null ){ + taskInfo.setProductType(lastData.getProductType()); + taskInfo.setConfirmManCode(lastData.getConfirmManCode()); + taskInfo.setConfirmManName(lastData.getConfirmManName()); + taskInfo.setConfirm(lastData.getConfirm()); + taskInfo.setConfirmTime(lastData.getConfirmTime()); + taskInfo.setConfirmRemark(lastData.getConfirmRemark()); + } + if(SecurityUtils.getUsername().equals(taskInfo.getConfirmManCode())){ + taskInfo.setMyself(true); + }else{ + taskInfo.setMyself(false); + } + } + + return taskInfo; + } + + @Override + @DS("#header.poolName") + public int submitConfirm(QcCheckReportIncome qcCheckReportIncome) { + Date nowTime = DateUtils.getNowDate(); + String nowManCode = SecurityUtils.getUsername(); + String nowManName = SecurityUtils.getLoginUser().getSysUser().getNickName(); + if("checkTypeSC".equals(qcCheckReportIncome.getCheckType())||"checkTypeSCXJ".equals(qcCheckReportIncome.getCheckType())){ + qcCheckReportIncome.setConfirmManCode(nowManCode); + qcCheckReportIncome.setConfirmManName(nowManName); + qcCheckReportIncome.setConfirmTime(nowTime); + /**qc_check_task**/ + int n = qcCheckReportIncomeMapper.submitConfirm(qcCheckReportIncome); + logger.info("qc_check_task：【二次确认】"+qcCheckReportIncome.getCheckType()+":"+n); + return n; + } + return 0; + } + } 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); } 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..3a3b68c83 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 @@ -2,6 +2,8 @@ package com.op.quality.service.impl; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; + import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.baomidou.dynamic.datasource.annotation.DS; @@ -77,6 +79,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Autowired private IQcCheckTaskDefectService qcCheckTaskDefectService; + @Autowired + private QcSampleRuleMapper qcSampleRuleMapper; + + @Autowired + private QcCheckTaskDefectMapper qcCheckTaskDefectMapper; + /** * 查询来料检验 * @@ -230,7 +238,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } } qcCheckTaskIncome.setNoOkQuality(noOkQuality); - + /**qc_sample_rule**/ + String sampNum = qcSampleRuleMapper.getSampNum(qcCheckTaskIncome); + if(StringUtils.isNotBlank(sampNum)){ + qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum)); + } + /**qc_check_task**/ qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); /**qc_check_task_detail**/ @@ -343,7 +356,16 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { @Override @DS("#header.poolName") public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - return qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + List dtos = qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + for(QcCheckTaskDetail detail:dtos){ + List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List urls = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + detail.setFiles(files); + detail.setFileUrls(urls); + } + } + return dtos; } @Override @@ -476,15 +498,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; } @@ -510,6 +532,41 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return dtos; } + @Override + @DS("#header.poolName") + public List getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome) { + List dtos = qcCheckTaskIncomeMapper.getCkeckTaskXJList(qcCheckTaskIncome); + for(QcCheckTaskIncome dto:dtos){ + //不良分类 + QcCheckTaskDefect defectqo = new QcCheckTaskDefect(); + defectqo.setBelongTo(dto.getRecordId()); + List defects = qcCheckTaskDefectMapper.selectQcCheckTaskDefectList(defectqo); + if(!CollectionUtils.isEmpty(defects)){ + List names = defects.stream().map(QcCheckTaskDefect::getDefectSubclass).collect(Collectors.toList()); + dto.setNoOkQualityNames(names.toString()); + List vals = defects.stream().map(QcCheckTaskDefect::getNoOkQuality).collect(Collectors.toList()); + dto.setNoOkQualityVals(vals.toString()); + } + + //检测项列表 + QcCheckTaskDetail detailqo = new QcCheckTaskDetail(); + detailqo.setBelongTo(dto.getRecordId()); + List qcCheckTaskDetails = qcCheckTaskDetailMapper.selectQcCheckTaskDetailList(detailqo); + if(!CollectionUtils.isEmpty(qcCheckTaskDetails)){ + for(QcCheckTaskDetail qcCheckTaskDetail:qcCheckTaskDetails){ + List files = qmsFileMapper.getBaseFileBatch(qcCheckTaskDetail.getRecordId()); + if (!CollectionUtils.isEmpty(files)) { + List urls = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList()); + qcCheckTaskDetail.setFiles(files); + qcCheckTaskDetail.setFileUrls(urls); + } + } + dto.setQcCheckTaskDetails(qcCheckTaskDetails); + } + } + return dtos; + } + @Override @Transactional(rollbackFor = Exception.class) public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) { @@ -583,6 +640,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { logger.info("更新qc_check_task_detail:"+n); /**qc_check_task_defect**/ + n=qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects(belongId); + logger.info("清理qc_check_task_defect:"+n); 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/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/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; } 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..a14d21a99 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; /** * 查询质量系统报列表 * @@ -162,106 +166,202 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { public List getXJCheckTableDetail(QcStaticTable qcStaticTable) { List projects = qcStaticTableMapper.getXJProjects(qcStaticTable); Map detailMap = qcStaticTableMapper.getProjectDetail(qcStaticTable); + Map picsMap = qcStaticTableMapper.picsMap(qcStaticTable); for(QcStaticTable project:projects){ - this.getDataFromMap(detailMap,project); + this.getDataFromMap(detailMap,project,picsMap); } - return projects; } - private void getDataFromMap(Map detailMap,QcStaticTable project){ + private void getDataFromMap(Map detailMap,QcStaticTable project,Map picsMap){ String keystr = project.getProjectId()+"08"; QcStaticTable detail = detailMap.get(keystr); - if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ - project.setColumn080090(detail.getStatus()); + if(detail!=null) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn080090(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn080090(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn080090(project.getColumn080090()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn090100(detail.getRemark()); + }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn090100(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn090100(project.getColumn090100()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn100110(detail.getRemark()); + }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn100110(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn100110(project.getColumn100110()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn110120(detail.getRemark()); + }else if(detail!=null&&detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn110120(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn110120(project.getColumn110120()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn123133(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn123133(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn123133(project.getColumn123133()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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){ + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn133143(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn133143(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn133143(project.getColumn133143()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn143153(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn143153(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn143153(project.getColumn143153()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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) { + if (StringUtils.isNotBlank(detail.getRemark())) { + project.setColumn153163(detail.getRemark()); + } else if (detail != null && StringUtils.isNotBlank(detail.getStatus())) { + project.setColumn153163(detail.getStatus().equals("Y") ? "✓" : "✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn153163(project.getColumn153163()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn163173(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn163173(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn163173(project.getColumn163173()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn180190(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn180190(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn180190(project.getColumn180190()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn190200(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn190200(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn190200(project.getColumn190200()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }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) { + if(StringUtils.isNotBlank(detail.getRemark())){ + project.setColumn200210(detail.getRemark()); + }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){ + project.setColumn200210(detail.getStatus().equals("Y")?"✓":"✘"); + } + QcStaticTable urlDTO = picsMap.get(detail.getRecordId()); + if(urlDTO!=null){ + project.setColumn200210(project.getColumn200210()+","+urlDTO.getProjectId().replace("&","&"));//projectId存的照片路径 + } }else{ project.setColumn200210("-"); } @@ -371,6 +471,71 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return dtos; } + @Override + @DS("#header.poolName") + public QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable) { + QcStaticTable dto = new QcStaticTable(); + //第一列日期 + List days = this.getDays(qcStaticTable.getYmArrayStart(), + qcStaticTable.getYmArrayEnd(),"ymd"); + qcStaticTable.setDataType("ymd"); + + + List titleList = qcStaticTableMapper.getDLTableTitle(qcStaticTable); + Map titleMap = titleList.stream().collect(Collectors.toMap(QcStaticTable::getYearMonth, (a) -> a)); + //表头：第一行 + List colName1 = titleList.stream().map(QcStaticTable::getMaterialName).distinct().collect(Collectors.toList()); + List colCode1 = titleList.stream().map(QcStaticTable::getMaterialCode).distinct().collect(Collectors.toList()); + dto.setTitleCol1(colName1); + //表头：第二行 + List colName2 = titleList.stream().map(QcStaticTable::getRuleName).distinct().collect(Collectors.toList()); + List colCode2 = titleList.stream().map(QcStaticTable::getProjectNo).distinct().collect(Collectors.toList()); + dto.setTitleCol2(colName2); + //均值列表 + List dxData = new ArrayList<>(); + + for(String day:days){ + HashMap result = new HashMap(); + List detailsData = new ArrayList<>(); + HashMap detailResult = new HashMap(); + result.put("ymdms",day+"均值"); + int i=0,j=0; + for(int m=0;m avgArray = Arrays.asList(avgArrayStr.split(",")); + BigDecimal addVal = new BigDecimal("0.00"); + for(String avgVal:avgArray){ + addVal = addVal.add(new BigDecimal(avgVal)); + } + BigDecimal avg = addVal.divide(new BigDecimal(avgArray.size()),2,BigDecimal.ROUND_HALF_UP); + result.put("mcode"+m+"Pcode"+n,avg); + detailResult.put("mcode"+m+"Pcode"+n+"Detail",avgArrayStr.replace(",","\n")); + }else{ + result.put("mcode"+m+"Pcode"+n,"0.00"); + detailResult.put("mcode"+m+"Pcode"+n+"Detail",""); + } + } + } + detailsData.add(detailResult); + result.put("details",detailsData); + dxData.add(result); + } + dto.setDxData(dxData); + return dto; + } + + @Override + @DS("#header.poolName") + public List getDLDetailList(QcStaticTable qcStaticTable) { + return null; + } + private List getHourProductionTitle(QcStaticTable qcStaticTable) { // 返回的日期集合 @@ -401,6 +566,50 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return dayHours; } + public List getDays(String startMonth,String endMonth,String type){ + // 返回的日期集合 + List days = new ArrayList(); + DateFormat dateFormat = null; + try { + Calendar tempStart = null; + Calendar tempEnd = null; + if("ymd".equals(type)){ + dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date start = dateFormat.parse(startMonth);//开始 + Date end = dateFormat.parse(endMonth);//结束 + + tempStart = Calendar.getInstance(); + tempStart.setTime(start); + + tempEnd = Calendar.getInstance(); + tempEnd.setTime(end); + tempEnd.add(Calendar.DAY_OF_MONTH, 1); + }else{ + dateFormat = new SimpleDateFormat("yyyy-MM"); + Date start = dateFormat.parse(startMonth);//开始 + Date end = dateFormat.parse(endMonth);//结束 + + tempStart = Calendar.getInstance(); + tempStart.setTime(start); + + tempEnd = Calendar.getInstance(); + tempEnd.setTime(end); + tempEnd.add(Calendar.MONTH, 1); + } + + while (tempStart.before(tempEnd)) { + days.add(dateFormat.format(tempStart.getTime())); + if("ymd".equals(type)) { + tempStart.add(Calendar.DAY_OF_MONTH, 1); + }else{ + tempStart.add(Calendar.MONTH, 1); + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + return days; + } } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 0895a8363..7abec76a6 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -36,14 +36,16 @@ 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,sample_quality, check_time, check_result, status, check_type, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, - factory_code, del_flag from qc_check_task + factory_code, del_flag,reason,product_type + from qc_check_task - - + + + + + insert into qc_check_task record_id, @@ -263,8 +328,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 2c46086ef..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..806ecc9e5 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 @@ -119,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and qct.check_type = #{checkType} and q.type_code = #{typeCode} + order by qct.create_time desc @@ -205,6 +215,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 +256,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{checkType}, #{typeCode}, + #{reason}, + #{productType}, + #{confirmManCode}, + #{confirmManName}, @@ -280,6 +298,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 +329,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 +356,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 + null,'', 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 +379,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 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..2259bea6c 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 + 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..400e8e8b4 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 @@ -82,23 +82,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index 6c2c10400..7adb7076d 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -76,7 +76,7 @@ public class SapController extends BaseController { if(!"ds_999".equals(dateSource.get("poolName"))){ logger.info("++++++++++++" + dateSource.get("poolName") + "++++product同步开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - + /**base_product**/ Date maxTime0 = sapBomMapper.getProductMaxTime(); if(maxTime0 != null){ Calendar calendar = Calendar.getInstance(); @@ -115,7 +115,7 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++bom同步开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime0 = sapBomMapper.getProductMaxTime(); + Date maxTime0 = sapBomMapper.getBomMaxTime(); if (maxTime0 != null) { Calendar calendar = Calendar.getInstance(); calendar.setTime(maxTime0); diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java index b7796b816..1953efb20 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java @@ -47,4 +47,6 @@ public interface SapBomMapper { Date getProductMaxTime(); Date getRouteMaxTime(); + + Date getBomMaxTime(); } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 8f04090a2..8fbf248b5 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -187,13 +187,7 @@ public class SapOrderServiceImpl implements SapOrderService { JCoParameterList J= func.getExportParameterList(); System.out.println(func.getExportParameterList()); L_MSG= func.getExportParameterList().getString("L_MSG"); - // String RETCODE = func.getExportParameterList().getString("RETCODE"); - //String LV_ORDER_NUMBER= func.getExportParameterList().getString("LV_ORDER_NUMBER"); -// if (RETCODE.equals(Constants.FAIL)){ -// return R.fail(LV_ORDER_NUM_List,L_MSG); -// } JCoTable LT_ZGD=func.getTableParameterList().getTable("LT_ZGD"); - for (int i = 0; i @@ -288,6 +288,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml index 8359972df..62798ef14 100644 --- a/op-modules/op-technology/src/main/resources/bootstrap.yml +++ b/op-modules/op-technology/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 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/controller/BaseProductController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductController.java index 084e11753..beaf079bf 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductController.java @@ -67,6 +67,15 @@ public class BaseProductController extends BaseController { return success(baseProductService.selectBaseProductByProductId(productId)); } + /** + * 获取物料信息详细信息 + */ + @RequiresPermissions("wms:product:query") + @GetMapping(value = "/code/{productCode}") + public AjaxResult selectBaseProductByProductCode(@PathVariable("productCode") String productCode) { + return success(baseProductService.selectBaseProductByProductCode(productCode)); + } + /** * 新增物料信息 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java index 69b6ff5a5..fa635b09e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java @@ -102,11 +102,8 @@ public class SysFactoryController extends BaseController { } // 查询工作中心 -// @RequiresPermissions("wms:factory:getWorkCenterList") @GetMapping("/getWorkCenterList") - public TableDataInfo getWorkCenterList(SysFactory sysFactory) { - startPage(); - List list = sysFactoryService.getWorkCenterList(sysFactory); - return getDataTable(list); + public AjaxResult getWorkCenterList(SysFactory sysFactory) { + return sysFactoryService.getWorkCenterList(sysFactory); } } 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/mapper/BaseProductMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductMapper.java index bba7be169..5bedcee67 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductMapper.java @@ -6,14 +6,14 @@ import com.op.wms.domain.BaseProduct; /** * 物料信息Mapper接口 - * + * * @author Open Platform * @date 2023-07-18 */ public interface BaseProductMapper { /** * 查询物料信息 - * + * * @param productId 物料信息主键 * @return 物料信息 */ @@ -21,7 +21,7 @@ public interface BaseProductMapper { /** * 查询物料信息列表 - * + * * @param baseProduct 物料信息 * @return 物料信息集合 */ @@ -29,7 +29,7 @@ public interface BaseProductMapper { /** * 新增物料信息 - * + * * @param baseProduct 物料信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface BaseProductMapper { /** * 修改物料信息 - * + * * @param baseProduct 物料信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface BaseProductMapper { /** * 删除物料信息 - * + * * @param productId 物料信息主键 * @return 结果 */ @@ -53,7 +53,7 @@ public interface BaseProductMapper { /** * 批量删除物料信息 - * + * * @param productIds 需要删除的数据主键集合 * @return 结果 */ @@ -61,4 +61,6 @@ public interface BaseProductMapper { String checkNameUnique(BaseProduct baseProduct); String checkCodeUnique(BaseProduct baseProduct); + + BaseProduct selectBaseProductByProductCode(String productCode); } 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/IBaseProductService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductService.java index a02abee7c..21cef305d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductService.java @@ -5,14 +5,14 @@ import com.op.wms.domain.BaseProduct; /** * 物料信息Service接口 - * + * * @author Open Platform * @date 2023-07-18 */ public interface IBaseProductService { /** * 查询物料信息 - * + * * @param productId 物料信息主键 * @return 物料信息 */ @@ -20,7 +20,7 @@ public interface IBaseProductService { /** * 查询物料信息列表 - * + * * @param baseProduct 物料信息 * @return 物料信息集合 */ @@ -28,7 +28,7 @@ public interface IBaseProductService { /** * 新增物料信息 - * + * * @param baseProduct 物料信息 * @return 结果 */ @@ -36,7 +36,7 @@ public interface IBaseProductService { /** * 修改物料信息 - * + * * @param baseProduct 物料信息 * @return 结果 */ @@ -44,7 +44,7 @@ public interface IBaseProductService { /** * 批量删除物料信息 - * + * * @param productIds 需要删除的物料信息主键集合 * @return 结果 */ @@ -52,7 +52,7 @@ public interface IBaseProductService { /** * 删除物料信息信息 - * + * * @param productId 物料信息主键 * @return 结果 */ @@ -60,4 +60,6 @@ public interface IBaseProductService { boolean checkCodeUnique(BaseProduct baseProduct); boolean checkNameUnique(BaseProduct baseProduct); + + public BaseProduct selectBaseProductByProductCode(String productCode); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java index ce4f9743c..331fb7f7c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java @@ -1,6 +1,8 @@ package com.op.wms.service; import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; import com.op.wms.domain.SysFactory; /** @@ -58,8 +60,8 @@ public interface ISysFactoryService { */ public int deleteSysFactoryByFactoryId(Long factoryId); - //好 - List getWorkCenterList(SysFactory sysFactory); + //查询工作中心 + AjaxResult getWorkCenterList(SysFactory sysFactory); //新增 判断逻辑 boolean checkFactoryCodeUnique(SysFactory sysFactory); 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..5e0cb6c2f 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); + } + /** * 新增设备管理 * @@ -347,7 +359,6 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { baseEquipmentMapper.bindAuxiliaryEquipment(equBindAuxiliaryEquipment); } } - return list; } @@ -360,6 +371,13 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { @Override @DS("#header.poolName") public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds) { + for(long equipmentId:equipmentIds){ + BaseEquipment list = baseEquipmentMapper.selectBaseEquipmentByEquipmentId(equipmentId); + //删除备件信息 + baseEquipmentMapper.deleteEquSpareEquipmentByCode(list.getEquipmentCode()); + //删除辅助设备 + baseEquipmentMapper.deleteAuxiliaryEquipmentByCode(list.getEquipmentCode()); + } return baseEquipmentMapper.deleteBaseEquipmentByEquipmentIds(equipmentIds); } @@ -372,6 +390,11 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { @Override @DS("#header.poolName") public int deleteBaseEquipmentByEquipmentId(Long equipmentId) { + BaseEquipment list = baseEquipmentMapper.selectBaseEquipmentByEquipmentId(equipmentId); + //删除备件信息 + baseEquipmentMapper.deleteEquSpareEquipmentByCode(list.getEquipmentCode()); + //删除辅助设备 + baseEquipmentMapper.deleteAuxiliaryEquipmentByCode(list.getEquipmentCode()); return baseEquipmentMapper.deleteBaseEquipmentByEquipmentId(equipmentId); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java index 59b081df3..cb76e50cb 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductServiceImpl.java @@ -14,7 +14,7 @@ import com.op.wms.service.IBaseProductService; /** * 物料信息Service业务层处理 - * + * * @author Open Platform * @date 2023-07-18 */ @@ -25,7 +25,7 @@ public class BaseProductServiceImpl implements IBaseProductService { /** * 查询物料信息 - * + * * @param productId 物料信息主键 * @return 物料信息 */ @@ -37,7 +37,7 @@ public class BaseProductServiceImpl implements IBaseProductService { /** * 查询物料信息列表 - * + * * @param baseProduct 物料信息 * @return 物料信息 */ @@ -49,7 +49,7 @@ public class BaseProductServiceImpl implements IBaseProductService { /** * 新增物料信息 - * + * * @param baseProduct 物料信息 * @return 结果 */ @@ -63,7 +63,7 @@ public class BaseProductServiceImpl implements IBaseProductService { /** * 修改物料信息 - * + * * @param baseProduct 物料信息 * @return 结果 */ @@ -77,7 +77,7 @@ public class BaseProductServiceImpl implements IBaseProductService { /** * 批量删除物料信息 - * + * * @param productIds 需要删除的物料信息主键 * @return 结果 */ @@ -89,7 +89,7 @@ public class BaseProductServiceImpl implements IBaseProductService { /** * 删除物料信息信息 - * + * * @param productId 物料信息主键 * @return 结果 */ @@ -130,4 +130,10 @@ public class BaseProductServiceImpl implements IBaseProductService { return true; } } + + @Override + @DS("#header.poolName") + public BaseProduct selectBaseProductByProductCode(String productCode) { + return baseProductMapper.selectBaseProductByProductCode(productCode); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java index edfec7c21..442ccb4aa 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java @@ -4,12 +4,14 @@ import java.util.List; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.SysFactoryMapper; import com.op.wms.domain.SysFactory; import com.op.wms.service.ISysFactoryService; +import static com.op.common.core.web.domain.AjaxResult.success; /** * 工厂模型Service业务层处理 @@ -99,15 +101,16 @@ public class SysFactoryServiceImpl implements ISysFactoryService { } /** - * 查询工厂模型列表 + * 查询工作中心 * * @param sysFactory 工厂模型 * @return 工厂模型 */ @Override @DS("#header.poolName") - public List getWorkCenterList(SysFactory sysFactory) { - return sysFactoryMapper.getWorkCenterList(sysFactory); + public AjaxResult getWorkCenterList(SysFactory sysFactory) { + List list= sysFactoryMapper.getWorkCenterList(sysFactory); + return success(list); } /** 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 @@ + + - + and product_code like concat('%', #{productCode}, '%') and product_desc_zh like concat('%', #{productDescZh}, '%') and product_model = #{productModel} @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and del_flag = '0' - + - + + + insert into base_product @@ -351,5 +353,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where product_code = #{productCode} and del_flag ='0' + - \ No newline at end of file +