From 5e3c032647c0a344882283359b7badc7c0188c0e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 4 Jan 2024 09:43:31 +0800 Subject: [PATCH 01/30] =?UTF-8?q?oa=E6=B5=81=E7=A8=8B=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/quality/controller/QuaController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index cd66a89fe..71a878e42 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -247,7 +247,7 @@ public class QuaController extends BaseController { return getDataTable(list); } - @PutMapping("/getBatchList") + @PostMapping("/getBatchList") public List getBatchList(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); return qcCheckTaskIncomeService.getBatchList(qcCheckTaskIncome); From d307cd97f48caa64222e9aaa72920725da4c7c7b Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jan 2024 10:10:06 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseEquipmentController.java | 20 ++ .../java/com/op/wms/domain/BaseEquipment.java | 187 ++++++++++++++++++ .../op/wms/mapper/BaseEquipmentMapper.java | 6 + .../op/wms/service/IBaseEquipmentService.java | 6 + .../impl/BaseEquipmentServiceImpl.java | 23 +++ .../mapper/wms/BaseEquipmentMapper.xml | 34 ++++ 6 files changed, 276 insertions(+) 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 164e6814a..ceb07217f 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 @@ -248,4 +248,24 @@ public class BaseEquipmentController extends BaseController { return getDataTable(list); } + /** + * 查询维修记录 + */ + @GetMapping("/getWXRecordsList") + public TableDataInfo getWXRecordsList(BaseEquipment baseEquipment) { + startPage(); + List list = baseEquipmentService.selectWXRecordsList(baseEquipment); + return getDataTable(list); + } + + /** + * 查询保养记录 + */ + @GetMapping("/getBYRecordsList") + public TableDataInfo getBYRecordsList(BaseEquipment baseEquipment) { + startPage(); + List list = baseEquipmentService.selectBYRecordsList(baseEquipment); + return getDataTable(list); + } + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index 34486ed0e..8f6d121be 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -1,11 +1,14 @@ package com.op.wms.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -259,6 +262,190 @@ public class BaseEquipment extends BaseEntity { //返回已经绑定辅助设备列表 private List selectedEquipmentData; +/////////////////////////维修记录 + /** 维修单号 */ + private String workCode; + + /** 维修人员 */ + private String workPerson; + + /** 维修组 */ + private String workTeam; + + /** 原因分析 */ + private String workReason; + + /** 故障描述 */ + private String workFaultDesc; + + /** 设备维修措施 */ + private String repairMeasures; + + /** 维修开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date workStartTime; + + /** 维修结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date workEndTime; + + /** 维修状态 */ + private String workStatus; + + /////////////////////////保养记录 + /** 单号 */ + private String orderCode; + + /** 循环周期 */ + private String planLoop; + + /** 实际开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date orderStart; + + /** 实际结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date orderEnd; + + /** 工单状态 */ + private String orderStatus; + + /** 工单费用 */ + private BigDecimal orderCost; + + /** 责任人 */ + private String planPerson; + + /** 工单用时 */ + private String orderCostTime; + + /** 签字 */ + private String orderSignPerson; +/////////////////////////////////// + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; +} + public String getOrderCode() { + return orderCode; + } + + public void setPlanLoop(String planLoop) { + this.planLoop = planLoop; + } + public String getPlanLoop() { + return planLoop; + } + + public void setOrderStart(Date orderStart) { + this.orderStart = orderStart; + } + public Date getOrderStart() { + return orderStart; + } + + public void setOrderEnd(Date orderEnd) { + this.orderEnd = orderEnd; + } + public Date getOrderEnd() { + return orderEnd; + } + + public void setOrderStatus(String orderStatus) { + this.orderStatus = orderStatus; + } + public String getOrderStatus() { + return orderStatus; + } + + public void setOrderCost(BigDecimal orderCost) { + this.orderCost = orderCost; + } + public BigDecimal getOrderCost() { + return orderCost; + } + + public void setPlanPerson(String planPerson) { + this.planPerson = planPerson; + } + public String getPlanPerson() { + return planPerson; + } + + public void setOrderCostTime(String orderCostTime) { + this.orderCostTime = orderCostTime; + } + public String getOrderCostTime() { + return orderCostTime; + } + + public void setOrderSignPerson(String orderSignPerson) { + this.orderSignPerson = orderSignPerson; + } + public String getOrderSignPerson() { + return orderSignPerson; + } + /////////////////////////////// + public String getRepairMeasures() { + return repairMeasures; + } + public void setRepairMeasures(String repairMeasures) { this.repairMeasures = repairMeasures; } + + public void setWorkFaultDesc(String workFaultDesc) { + this.workFaultDesc = workFaultDesc; + } + public String getWorkFaultDesc() { + return workFaultDesc; + } + + public void setWorkReason(String workReason) { + this.workReason = workReason; + } + public String getWorkReason() { + return workReason; + } + + public void setWorkStatus(String workStatus) { + this.workStatus = workStatus; + } + public String getWorkStatus() { + return workStatus; + } + + public void setWorkPerson(String workPerson) { + this.workPerson = workPerson; + } + public String getWorkPerson() { + return workPerson; + } + + public void setWorkTeam(String workTeam) { + this.workTeam = workTeam; + } + public String getWorkTeam() { + return workTeam; + } + + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + public String getWorkCode() { + return workCode; + } + + public void setWorkStartTime(Date workStartTime) { + this.workStartTime = workStartTime; + } + public Date getWorkStartTime() { + return workStartTime; + } + + public void setWorkEndTime(Date workEndTime) { + this.workEndTime = workEndTime; + } + public Date getWorkEndTime() { + return workEndTime; + } + public void setSelectedEquipmentData(List selectedEquipmentData) { this.selectedEquipmentData = selectedEquipmentData; } 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 d77bd1290..d58080b39 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 @@ -120,4 +120,10 @@ public interface BaseEquipmentMapper { //查询组线/辅助设备 List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); + + //查询维修记录 + List selectWXRecordsList(BaseEquipment baseEquipment); + + //查询保养记录 + List selectBYRecordsList(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java index df5334814..927b76cc9 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 @@ -83,4 +83,10 @@ public interface IBaseEquipmentService { //查询组线下的辅助设备 List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); + + //查询维修记录 + List selectWXRecordsList(BaseEquipment baseEquipment); + + //查看保养记录 + List selectBYRecordsList(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java index 7f01eb2aa..8451c6f76 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 @@ -569,4 +569,27 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { return baseEquipmentMapper.selectAuxiliaryEquipmentList(equBindAuxiliaryEquipment); } + /** + * 查询维修记录 + * + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List selectWXRecordsList(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectWXRecordsList(baseEquipment); + } + + /** + * 查询保养记录 + * + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List selectBYRecordsList(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectBYRecordsList(baseEquipment); + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index 37311781a..4e90a2db6 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 @@ -622,4 +622,38 @@ where ebac.equipment_code = #{equipmentCode} + + + + + \ No newline at end of file From a68a3ac1a856cd9b779bee1b0b8e31e9e6cb0235 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jan 2024 13:50:45 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E8=AE=BE=E5=A4=87=20=E7=BB=B4=E4=BF=AE--?= =?UTF-8?q?-->=E8=AE=BE=E5=A4=87=E5=AE=8C=E5=A5=BD=E7=8E=87=EF=BC=88?= =?UTF-8?q?=E4=B8=80=E5=A4=A9=E5=86=85=E5=A4=9A=E6=AC=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/device/mapper/EquOperationMapper.java | 6 +++ .../impl/EquRepairWorkOrderServiceImpl.java | 48 +++++++++++++++---- .../mapper/device/EquOperationMapper.xml | 7 +++ 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java index 7b142378a..65767b1e3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java @@ -86,4 +86,10 @@ public interface EquOperationMapper { // 分批次删除 int deleteOperation(@Param("delSize") int delSize); + + /** + * 查找设备对应完好率 + * @return + */ + public EquOperation selectEquipmentIntegrityRate(@Param("time")String time, @Param("equipmentCode")String equipmentCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 4af8f276b..eea0cbf36 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -1,6 +1,8 @@ package com.op.device.service.impl; import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -47,6 +49,9 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService @Autowired private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private EquOperationMapper equOperationMapper; + /** * 查询维修工单 * @@ -152,18 +157,19 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService * 修改维修工单 * * @param equRepairWorkOrder 维修工单 - * @return 结果outSourcePerson + * @return */ @Override @DS("#header.poolName") public int updateEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder) { + //1.是否停机 if(equRepairWorkOrder.getWorkDownMachine().equals("0")){ equRepairWorkOrder.setWorkPlanDownTime(null); } equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); - //先删除每个维修工单对应图片 + //2.先删除每个维修工单对应图片，再新增照片 equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); if (StringUtils.isNotEmpty(equRepairWorkOrder.getAfterRepairFile())) { String[] ids = equRepairWorkOrder.getAfterRepairFile().split(","); @@ -184,7 +190,7 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService equRepairWorkOrderMapper.insertBaseFileBatch(files); } - //更新标准表 + //3.更新标准表 for(EquOrderStandard equOrderStandard:equRepairWorkOrder.getStandardList()){ //先删除每个检查项标准图片 String imageType = "4"; @@ -214,18 +220,44 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard); } + //5.更新设备状态 if(equRepairWorkOrder.getWorkStatus().equals("1")){ - //修改设备状态 由维修中改为正常运行 + //5.1修改设备状态 由维修中改为正常运行 EquEquipment equEquipment = new EquEquipment(); equEquipment.setEquipmentCode(equRepairWorkOrder.getEquipmentCode()); equEquipment.setEquipmentStatus("1"); equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); + + //5.2维修完成后 相应的设备完好率重新计算 小时计算 保留一位小数 实际故障时间 换算成小时 + String hours = equRepairWorkOrder.getWorkCostTime().substring(0,equRepairWorkOrder.getWorkCostTime().length()-2); //截掉后两位 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String time = sdf.format(equRepairWorkOrder.getWorkEndTime()); + EquOperation equOperation = equOperationMapper.selectEquipmentIntegrityRate(time,equRepairWorkOrder.getEquipmentCode()); + + if(equOperation != null){ + DecimalFormat df = new DecimalFormat("#.##"); + //实际运行时间 = 实际运行时间 - 故障时间 + double result = Double.parseDouble(equOperation.getActualOperationTime()) - Double.parseDouble(hours); + //故障时间 = 原来的故障时间 + 这次的故障时间 + double faultTime = Double.parseDouble(equOperation.getFaultTime()) + Double.parseDouble(hours); + equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 + equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 + + BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 + BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());// 运行时间 + + // 故障率计算（故障时间/运行时间） + equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + equOperation.setUpdateBy(SecurityUtils.getUsername()); + equOperation.setUpdateTime(DateUtils.getNowDate()); + equOperationMapper.updateEquOperation(equOperation); + } } - // 费用 - BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); - BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); - equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); + // 备件费用 +// BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); +// BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); +// equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml index 1eda9f706..14afae5ca 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml @@ -256,4 +256,11 @@ ORDER BY id OFFSET 0 ROWS FETCH NEXT #{delSize} ROWS ONLY) + + + \ No newline at end of file From 827657c43d606120a825f8c6fe283c120c4cd1bd Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 4 Jan 2024 15:44:37 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/quality/ChartSeriesDTO.java | 18 ++++ .../controller/QcStaticTableController.java | 13 +++ .../quality/domain/QcCheckReportIncome.java | 9 ++ .../op/quality/domain/QcCheckTaskProduce.java | 9 ++ .../com/op/quality/domain/QcStaticTable.java | 20 ++++ .../quality/mapper/QcStaticTableMapper.java | 6 ++ .../service/IQcStaticTableService.java | 3 + .../impl/QcCheckTaskIncomeServiceImpl.java | 44 ++++----- .../impl/QcStaticTableServiceImpl.java | 99 ++++++++++++++++++- .../quality/QcCheckReportIncomeMapper.xml | 4 +- .../quality/QcCheckTaskProduceMapper.xml | 4 +- .../quality/QcCheckTypeProjectMapper.xml | 4 +- .../mapper/quality/QcStaticTableMapper.xml | 58 ++++++++--- 13 files changed, 248 insertions(+), 43 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java index 24e016d77..2751d6c1e 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java @@ -12,6 +12,24 @@ public class ChartSeriesDTO { private List yAxisData; private List series; + private List legendData; + private List xAxisData; + + public List getxAxisData() { + return xAxisData; + } + + public void setxAxisData(List xAxisData) { + this.xAxisData = xAxisData; + } + + public List getLegendData() { + return legendData; + } + + public void setLegendData(List legendData) { + this.legendData = legendData; + } public List getyAxisData() { return yAxisData; 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 bc828858c..3f3f190c6 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 @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.common.core.utils.DateUtils; import com.op.system.api.domain.quality.ChartDTO; +import com.op.system.api.domain.quality.ChartSeriesDTO; import com.op.system.api.domain.quality.FactoryDto; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -251,4 +252,16 @@ public class QcStaticTableController extends BaseController { List list = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); return list; } + /**巡检小时不良**/ + @GetMapping("/getXJChartData") + public ChartSeriesDTO getXJChartData(QcStaticTable qcStaticTable) { + if(StringUtils.isEmpty(qcStaticTable.getYmdms())){ + LocalDate date = LocalDate.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String ymStr = dtf.format(date); + qcStaticTable.setYmdms(ymStr);//end + } + ChartSeriesDTO dto = qcStaticTableService.getXJChartData(qcStaticTable); + return dto; + } } 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 6bf0ff3f5..759f4db95 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 @@ -124,6 +124,15 @@ public class QcCheckReportIncome extends BaseEntity { private String checkTimeEnd; private String typeCode;//大类 private String checkType;//小类 + private String checkName; + + public String getCheckName() { + return checkName; + } + + public void setCheckName(String checkName) { + this.checkName = checkName; + } public BigDecimal getSampleQuality() { return sampleQuality; 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 47445f58b..6db2aca50 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 @@ -144,6 +144,15 @@ public class QcCheckTaskProduce extends BaseEntity { @Excel(name = "C类不合格数量") private BigDecimal cNoOkquality; + private String checkName; + + public String getCheckName() { + return checkName; + } + + public void setCheckName(String checkName) { + this.checkName = checkName; + } public String getOrderType() { return orderType; 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 e3e30f7da..66155a454 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 @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; import com.op.system.api.domain.quality.ChartDTO; +import com.op.system.api.domain.quality.ChartSeriesDTO; import java.math.BigDecimal; import java.util.Date; @@ -83,6 +84,24 @@ public class QcStaticTable extends BaseEntity { private String column180190; private String column190200; private String column200210; + private String startDateStr; + private String endDateStr; + + public String getStartDateStr() { + return startDateStr; + } + + public void setStartDateStr(String startDateStr) { + this.startDateStr = startDateStr; + } + + public String getEndDateStr() { + return endDateStr; + } + + public void setEndDateStr(String endDateStr) { + this.endDateStr = endDateStr; + } public String getColumn080090() { return column080090; @@ -531,4 +550,5 @@ public class QcStaticTable extends BaseEntity { public void setSupplierName(String supplierName) { this.supplierName = supplierName; } + } 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 c2f7555ef..d6dea4e39 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 @@ -45,4 +45,10 @@ public interface QcStaticTableMapper { List getXJProjects(QcStaticTable qcStaticTable); @MapKey("ymdms") Map getProjectDetail(QcStaticTable qcStaticTable); + + List getBatchnos(String orderNo); + + List getLegendData(QcStaticTable qcStaticTable); + @MapKey("ymdms") + Map getXJMapData(QcStaticTable qcStaticTable); } 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 a2e6ab7ff..e769347cc 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 @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.op.quality.domain.QcStaticTable; +import com.op.system.api.domain.quality.ChartSeriesDTO; import com.op.system.api.domain.quality.FactoryDto; /** @@ -33,4 +34,6 @@ public interface IQcStaticTableService { List getXJCheckTableList(QcStaticTable qcStaticTable); List getXJCheckTableDetail(QcStaticTable qcStaticTable); + + ChartSeriesDTO getXJChartData(QcStaticTable qcStaticTable); } 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 bca08e497..2562bccc9 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 @@ -389,7 +389,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { //发起来料检验OA流程 Map paramMap = new HashMap<>(); - paramMap.put("user",qcCheckTaskIncome.getUpdateBy());//提交人工号 + paramMap.put("user","019047");//提交人工号qcCheckTaskIncome.getUpdateBy() paramMap.put("requestLevel",0);//流程紧急度 paramMap.put("requestName","ZL0010-来料检验不合格审批流程(定单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 paramMap.put("workflowld","26258");//该流程对应的唯- workFlowld @@ -397,10 +397,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { StringBuffer mainObject = new StringBuffer(); mainObject.append("{"); mainObject.append("\"CQ\":"+1);//厂区 - mainObject.append("\"LLLB\":"+0);//来料类别【0、1】 - mainObject.append("\"MATNR\""+"\"000000010101003200\"");//物料编码 + mainObject.append(",\"LLLB\":"+0);//来料类别【0、1】 + mainObject.append(",\"MATNR\":"+"\"000000010101003200\"");//物料编码 //mainObject.append("\"MAKTX\""+MATNR);//物料名称 - mainObject.append("{"); + mainObject.append("}"); paramMap.put("mainObject",mainObject.toString()); logger.info("流程Id 26258:"+ JSONObject.toJSONString(paramMap)); AjaxResult oaR = remoteOpenService.OAInspection(paramMap); @@ -549,24 +549,24 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); logger.info("qc_check_unqualified:"+n); - //发起来料检验OA流程 - Map paramMap = new HashMap<>(); - paramMap.put("user",updateBy);//提交人工号 - paramMap.put("requestLevel",0);//流程紧急度 - paramMap.put("requestName","ZL0010-来料检验不合格审批流程(定单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 - paramMap.put("workflowld","26258");//该流程对应的唯- workFlowld - - StringBuffer mainObject = new StringBuffer(); - mainObject.append("{"); - mainObject.append("\"CQ\":"+1);//厂区 - mainObject.append("\"LLLB\":"+0);//来料类别【0、1】 - mainObject.append("\"MATNR\""+"\"000000010101003200\"");//物料编码 - //mainObject.append("\"MAKTX\""+MATNR);//物料名称 - mainObject.append("{"); - paramMap.put("mainObject",mainObject.toString()); - - AjaxResult oaR = remoteOpenService.OAInspection(paramMap); - logger.info("流程Id 26258:"+ JSONObject.toJSONString(oaR)); +// //发起来料检验OA流程 +// Map paramMap = new HashMap<>(); +// paramMap.put("user",updateBy);//提交人工号 +// paramMap.put("requestLevel",0);//流程紧急度 +// paramMap.put("requestName","ZL0010-来料检验不合格审批流程(定单:"+qcCheckTaskIncome.getOrderNo()+")");//流程名称 +// paramMap.put("workflowld","26258");//该流程对应的唯- workFlowld +// +// StringBuffer mainObject = new StringBuffer(); +// mainObject.append("{"); +// mainObject.append("\"CQ\":"+1);//厂区 +// mainObject.append("\"LLLB\":"+0);//来料类别【0、1】 +// mainObject.append("\"MATNR\""+"\"000000010101003200\"");//物料编码 +// //mainObject.append("\"MAKTX\""+MATNR);//物料名称 +// mainObject.append("{"); +// paramMap.put("mainObject",mainObject.toString()); +// +// AjaxResult oaR = remoteOpenService.OAInspection(paramMap); +// logger.info("流程Id 26258:"+ JSONObject.toJSONString(oaR)); } return n ; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 4c77a4bc0..d70717243 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 @@ -1,11 +1,20 @@ package com.op.quality.service.impl; import java.math.BigDecimal; -import java.util.List; -import java.util.Map; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; +import com.op.quality.domain.QcCheckTaskIncome; +import com.op.system.api.domain.quality.ChartDTO; +import com.op.system.api.domain.quality.ChartSeriesDTO; import com.op.system.api.domain.quality.FactoryDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -141,6 +150,14 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { @DS("#header.poolName") public List getXJCheckTableList(QcStaticTable qcStaticTable) { List tabledtos = qcStaticTableMapper.getXJCheckTableList(qcStaticTable); + for(QcStaticTable tabledto:tabledtos){ + List batchnos = qcStaticTableMapper.getBatchnos(tabledto.getOrderNo()); + String ordernoStr = ""; + for(String batchno:batchnos){ + ordernoStr += batchno+";"; + }; + tabledto.setIncomeBatchNo(ordernoStr); + } return tabledtos; } @@ -253,5 +270,83 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { project.setColumn200210("-"); } } + /**巡检小时不良**/ + @Override + @DS("#header.poolName") + public ChartSeriesDTO getXJChartData(QcStaticTable qcStaticTable) { + ChartSeriesDTO seriesDTO = new ChartSeriesDTO(); + //获取当天参与生产的车间 + List legends = qcStaticTableMapper.getLegendData(qcStaticTable); + List legendData = new ArrayList<>(); + if(!CollectionUtils.isEmpty(legends)){ + legendData=legends.stream().map(QcStaticTable::getSupplierName).collect(Collectors.toList()); + }else{ + return null; + } + seriesDTO.setLegendData(legendData); + //横轴时间 + qcStaticTable.setStartDateStr(qcStaticTable.getYmdms()+" 08:00:00"); + qcStaticTable.setEndDateStr(qcStaticTable.getYmdms()+" 08:00:00"); + List xAxisData = this.getHourProductionTitle(qcStaticTable); + seriesDTO.setxAxisData(xAxisData); + //数据 + Map dataMap = qcStaticTableMapper.getXJMapData(qcStaticTable); + List series = new ArrayList<>(); + ChartDTO serie = null; + for(QcStaticTable legend:legends){ + serie= new ChartDTO(); + serie.setName(legend.getSupplierName()); + List data = new ArrayList<>(); + for(String houreName:xAxisData){ + String key = legend.getSupplierCode()+houreName.replace("时",""); + QcStaticTable qt = dataMap.get(key); + if(qt!=null&&StringUtils.isNotBlank(qt.getSampleQuality())){ + BigDecimal noOkRate = new BigDecimal(qt.getNoOkNums()) + .multiply(new BigDecimal(100)) + .divide(new BigDecimal(qt.getSampleQuality()),2,BigDecimal.ROUND_HALF_UP); + data.add(noOkRate.doubleValue()); + }else{ + data.add(0.00); + } + serie.setData(data); + } + serie.setData(data); + series.add(serie); + } + seriesDTO.setSeries(series); + + return seriesDTO; + } + + private List getHourProductionTitle(QcStaticTable qcStaticTable) { + + // 返回的日期集合 + List dayHours = new ArrayList(); + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH"); + try { + + Date start = dateFormat.parse(qcStaticTable.getStartDateStr());//开始 + + Date end = dateFormat.parse(qcStaticTable.getEndDateStr());//结束 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(end); + calendar.add(Calendar.HOUR_OF_DAY, 14); + end = calendar.getTime(); + + Calendar tempStart = Calendar.getInstance(); + tempStart.setTime(start); + + Calendar tempEnd = Calendar.getInstance(); + tempEnd.setTime(end); + while (tempStart.before(tempEnd)) { + dayHours.add(dateFormat.format(tempStart.getTime()).split(" ")[1]+"时"); + tempStart.add(Calendar.HOUR_OF_DAY, 1); + } + } catch (ParseException e) { + e.printStackTrace(); + } + + return dayHours; + } } 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 dcdc372f9..a7dd6cec8 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 @@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,qct.sample_quality, qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, - q.type_code + q.type_code,q.check_name from qc_check_task qct left join qc_check_type q on q.id = qct.check_type 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 1ad7a3206..7bf0cd55c 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -56,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.create_by,qct.create_time, qct.update_by, qct.update_time, qct.check_type,qct.sample_quality,qct.noOk_quality, qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality, - q.type_code + q.type_code,q.check_name from qc_check_task qct left join qc_check_type q on q.id = qct.check_type diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 672a754e6..6563430fb 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ctp.sample_num, ctp.sort FROM qc_check_type_project ctp - LEFT JOIN qc_check_project cp ON ctp.project_id = cp.id AND cp.del_flag = '0' + LEFT JOIN qc_check_project cp ON ctp.project_id = cp.id - AND ctp.del_flag = '0' + AND ctp.del_flag = '0' AND cp.del_flag = '0' and ctp.project_id = #{projectId} and ctp.type_id = #{typeId} and ctp.standard_value like concat('%', #{standardValue}, '%') 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 739fe1347..faa8169c5 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 @@ -132,26 +132,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + From 3a9aa84d562503b9b8571b0230a23fb83d945835 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 4 Jan 2024 15:46:45 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/quality/controller/QcStaticTableController.java | 2 ++ 1 file changed, 2 insertions(+) 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 3f3f190c6..17aaa5bfc 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 @@ -253,6 +253,8 @@ public class QcStaticTableController extends BaseController { return list; } /**巡检小时不良**/ + + @RequiresPermissions("quality:qcTableXJAnalysis:list") @GetMapping("/getXJChartData") public ChartSeriesDTO getXJChartData(QcStaticTable qcStaticTable) { if(StringUtils.isEmpty(qcStaticTable.getYmdms())){ From 096e30657db3d7e994f09e6ab740cad408f7420c Mon Sep 17 00:00:00 2001 From: shaoyong Date: Thu, 4 Jan 2024 17:05:42 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E9=A6=96=E6=A3=80=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcCheckReportFirstController.java | 185 ++++++++++++++++ .../QcCheckReportIncomeController.java | 1 - .../QcCheckReportProduceController.java | 1 - .../QcCheckReportProductController.java | 1 - .../service/IQcCheckReportFirstService.java | 78 +++++++ .../impl/QcCheckReportFirstServiceImpl.java | 207 ++++++++++++++++++ .../quality/QcCheckReportIncomeMapper.xml | 1 + 7 files changed, 471 insertions(+), 3 deletions(-) create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java new file mode 100644 index 000000000..be6331364 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java @@ -0,0 +1,185 @@ +package com.op.quality.controller; + +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcBomComponent; +import com.op.quality.domain.QcCheckReportIncome; +import com.op.quality.domain.QcCheckTaskDetail; +import com.op.quality.domain.QcSupplier; +import com.op.quality.service.IQcCheckReportFirstService; +import com.op.system.api.domain.SysUser; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.List; + +/** + * 来料检验Controller + * + * @author Open Platform + * @date 2023-10-19 + */ +@RestController +@RequestMapping("/qcFirstReport") +public class QcCheckReportFirstController extends BaseController { + @Autowired + private IQcCheckReportFirstService qcCheckReportFirstService; + + /** + * 查询来料检验列表 + */ + @RequiresPermissions("quality:firstReport:list") + @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)+" 23:59:59"; + qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end + } + +// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ +// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start +// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end +// } + + startPage(); + List list = qcCheckReportFirstService.selectQcCheckReportIncomeList(qcCheckReportIncome); + return getDataTable(list); + } + + /** + * 导出来料检验列表 + */ + @RequiresPermissions("quality:firstReport:export") + @Log(title = "来料检验", businessType = BusinessType.EXPORT) + @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 + } + +// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ +// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start +// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end +// } + + List list = qcCheckReportFirstService.selectQcCheckReportIncomeList(qcCheckReportIncome); + ExcelUtil util = new ExcelUtil(QcCheckReportIncome.class); + util.exportExcel(response, list, "来料检验数据"); + } + + /** + * 获取来料检验详细信息 + */ + @RequiresPermissions("quality:firstReport:query") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") String recordId) { + return success(qcCheckReportFirstService.selectQcCheckReportIncomeByRecordId(recordId)); + } + + /** + * 新增来料检验 + */ + @RequiresPermissions("quality:firstReport:add") + @Log(title = "来料检验", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcCheckReportIncome qcCheckReportIncome) { + int r = qcCheckReportFirstService.insertQcCheckReportIncome(qcCheckReportIncome); + if(r>0){ + return toAjax(r); + } + return error("添加失败：请检查物料的关联检测项"); + } + + /** + * 修改来料检验 + */ + @RequiresPermissions("quality:firstReport:edit") + @Log(title = "来料检验", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcCheckReportIncome qcCheckReportIncome) { + return toAjax(qcCheckReportFirstService.updateQcCheckReportIncome(qcCheckReportIncome)); + } + + /** + * 删除来料检验 + */ + @RequiresPermissions("quality:firstReport:remove") + @Log(title = "来料检验", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable String[] recordIds) { + return toAjax(qcCheckReportFirstService.deleteQcCheckReportIncomeByRecordIds(recordIds)); + } + + /** + * 查询BOM物料管理列表 + */ + @GetMapping("/getQcListBom") + public TableDataInfo getQcListBom(QcBomComponent bomComponent) { + startPage(); + List list = qcCheckReportFirstService.getQcListBom(bomComponent); + return getDataTable(list); + } + /** + * 查询供应商列表 + */ + @GetMapping("/getQcListSupplier") + public TableDataInfo getQcListSupplier(QcSupplier qcSupplier) { + startPage(); + List list = qcCheckReportFirstService.getQcListSupplier(qcSupplier); + return getDataTable(list); + } + /** + * 查询人员列表 + */ + @GetMapping("/getQcListUser") + public TableDataInfo getQcListUser(SysUser sysUser) { + startPage(); + List list = qcCheckReportFirstService.getQcListUser(sysUser); + return getDataTable(list); + } + + /** + * 状态修改 + */ + @PutMapping("/changeIncomeStatus") + public AjaxResult changeIncomeStatus(@RequestBody QcCheckReportIncome qcCheckReportIncome) { + qcCheckReportIncome.setUpdateBy(SecurityUtils.getUsername()); + qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate()); + return toAjax(qcCheckReportFirstService.updateIncomeStatus(qcCheckReportIncome)); + } + + /** + * 检验项目弹窗列表 + * @param + * @return + */ + @GetMapping("/getCkeckProjectList") + public TableDataInfo getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { + List list = qcCheckReportFirstService.getCkeckProjectList(qcCheckTaskDetail); + return getDataTable(list); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java index b9a1d728f..99683444d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java @@ -176,7 +176,6 @@ public class QcCheckReportIncomeController extends BaseController { */ @GetMapping("/getCkeckProjectList") public TableDataInfo getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - startPage(); List list = qcCheckReportIncomeService.getCkeckProjectList(qcCheckTaskDetail); return getDataTable(list); } 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 da833bb85..1cd85fcf5 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 @@ -174,7 +174,6 @@ public class QcCheckReportProduceController extends BaseController { */ @GetMapping("/getCkeckProjectList") public TableDataInfo getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - startPage(); List list = qcCheckReportProduceService.getCkeckProjectList(qcCheckTaskDetail); return getDataTable(list); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java index 37021e76b..d7a55bbb8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java @@ -179,7 +179,6 @@ public class QcCheckReportProductController extends BaseController { */ @GetMapping("/getCkeckProjectList") public TableDataInfo getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - startPage(); List list = qcCheckReportProductService.getCkeckProjectList(qcCheckTaskDetail); return getDataTable(list); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java new file mode 100644 index 000000000..8b0de07ca --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java @@ -0,0 +1,78 @@ +package com.op.quality.service; + +import com.op.quality.domain.QcBomComponent; +import com.op.quality.domain.QcCheckReportIncome; +import com.op.quality.domain.QcCheckTaskDetail; +import com.op.quality.domain.QcSupplier; +import com.op.system.api.domain.SysUser; + +import java.util.List; + +/** + * 来料报告Service接口 + * + * @author Open Platform + * @date 2023-10-19 + */ +public interface IQcCheckReportFirstService { + /** + * 查询来料报告 + * + * @param recordId 来料报告主键 + * @return 来料检验 + */ + public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId); + + /** + * 查询来料报告列表 + * + * @param qcCheckReportIncome 来料报告 + * @return 来料检验集合 + */ + public List selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome); + + /** + * 新增来料报告 + * + * @param qcCheckReportIncome 来料报告 + * @return 结果 + */ + public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome); + + /** + * 修改来料报告 + * + * @param qcCheckReportIncome 来料报告 + * @return 结果 + */ + public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome); + + /** + * 批量删除来料报告 + * + * @param recordIds 需要删除的来料报告主键集合 + * @return 结果 + */ + public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds); + + /** + * 删除来料报告信息 + * + * @param recordId 来料报告主键 + * @return 结果 + */ + public int deleteQcCheckReportIncomeByRecordId(String recordId); + + public List getQcListBom(QcBomComponent bomComponent); + + public List getQcListSupplier(QcSupplier qcSupplier); + + public List getQcListUser(SysUser sysUser); + + int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome); + + List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail); + + public List getPrintData(QcCheckReportIncome qcCheckReportIncome); + +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java new file mode 100644 index 000000000..1e243b338 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java @@ -0,0 +1,207 @@ +package com.op.quality.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.*; +import com.op.quality.mapper.QcCheckReportIncomeMapper; +import com.op.quality.mapper.QcCheckTaskDetailMapper; +import com.op.quality.mapper.QcCheckTypeProjectMapper; +import com.op.quality.mapper.QcMaterialGroupDetailMapper; +import com.op.quality.service.IQcCheckReportFirstService; +import com.op.quality.service.IQcCheckReportIncomeService; +import com.op.system.api.domain.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +/** + * 来料检验Service业务层处理 + * + * @author Open Platform + * @date 2023-10-19 + */ +@Service +public class QcCheckReportFirstServiceImpl implements IQcCheckReportFirstService { + @Autowired + private QcCheckReportIncomeMapper qcCheckReportIncomeMapper; + + @Autowired + private QcCheckTypeProjectMapper qcCheckTypeProjectMapper; + + @Autowired + private QcMaterialGroupDetailMapper qcMaterialGroupDetailMapper; + + @Autowired + private QcCheckTaskDetailMapper qcCheckTaskDetailMapper; + + /** + * 查询来料检验 + * + * @param recordId 来料检验主键 + * @return 来料检验 + */ + @Override + @DS("#header.poolName") + public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { + return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + } + + /** + * 查询来料检验列表 + * + * @param qcCheckReportIncome 来料检验 + * @return 来料检验 + */ + @Override + @DS("#header.poolName") + public List selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome) { + qcCheckReportIncome.setDelFlag("0"); + qcCheckReportIncome.setTypeCode("produce"); + qcCheckReportIncome.setCheckType("checkTypeSC"); + return qcCheckReportIncomeMapper.selectQcCheckReportIncomeList(qcCheckReportIncome); + } + + /** + * 新增来料检验 + * + * @param qcCheckReportIncome 来料检验 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) { + + String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); + int liushuiNum = qcCheckReportIncomeMapper.getTodayMaxNum(qcCheckReportIncome); + String liushuiStr = String.format("%04d", liushuiNum); + + String createBy = SecurityUtils.getUsername(); + Date nowDate= DateUtils.getNowDate(); + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); + + qcCheckReportIncome.setCheckNo(bpDD+liushuiStr); + + /**qc_check_task_income**/ + String beLongId = IdUtils.fastSimpleUUID(); + qcCheckReportIncome.setRecordId(beLongId); + qcCheckReportIncome.setFactoryCode(factoryCode); + qcCheckReportIncome.setCreateTime(nowDate); + qcCheckReportIncomeMapper.insertQcCheckReportIncome(qcCheckReportIncome); + + /**取检测项**/ + QcCheckTypeProject qctp= new QcCheckTypeProject(); + qctp.setTypeId(qcCheckReportIncome.getCheckType());//生产过程检验 + qctp.setMaterialCode(qcCheckReportIncome.getMaterialCode());//特性 + /**qc_check_type_project**/ + List items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp); + if(CollectionUtils.isEmpty(items)){ + /**qc_material_group_detail**/ + QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckReportIncome.getMaterialCode()); + if(group == null){ + return 0;//没有找到检测项目 + } + qctp.setGroupId(group.getGroupId());//共性 + items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); + } + + /**qc_check_task_detail**/ + if(CollectionUtils.isEmpty(items)){ + return 0;//没有找到检测项目 + } + + for(QcCheckTaskDetail item:items){ + item.setRecordId(IdUtils.fastSimpleUUID()); + item.setBelongTo(beLongId); + item.setCreateTime(nowDate); + item.setCreateBy(createBy); + item.setFactoryCode(factoryCode); + item.setStatus("N"); + } + return qcCheckTaskDetailMapper.addBatch(items); + } + + /** + * 修改来料检验 + * + * @param qcCheckReportIncome 来料检验 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) { + qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate()); + return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome); + } + + /** + * 批量删除来料检验 + * + * @param recordIds 需要删除的来料检验主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds) { + return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordIds(recordIds); + } + + /** + * 删除来料检验信息 + * + * @param recordId 来料检验主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcCheckReportIncomeByRecordId(String recordId) { + return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordId(recordId); + } + + @Override + @DS("#header.poolName") + public List getQcListBom(QcBomComponent bomComponent) { + return qcCheckReportIncomeMapper.getQcListBom(bomComponent); + } + + @Override + @DS("#header.poolName") + public List getQcListSupplier(QcSupplier qcSupplier) { + return qcCheckReportIncomeMapper.getQcListSupplier(qcSupplier); + } + + @Override + @DS("master") + public List getQcListUser(SysUser sysUser) { + return qcCheckReportIncomeMapper.getQcListUser(sysUser); + } + + @Override + @DS("#header.poolName") + public int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome) { + return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome); + } + + @Override + @DS("#header.poolName") + public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { + return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + } + + @Override + @DS("#header.poolName") + public List getPrintData(QcCheckReportIncome qcCheckReportIncome) { + return null; + } + +} 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 a7dd6cec8..4b7f9f48c 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 @@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and CONVERT(varchar(30),qct.check_time, 120) >= #{checkTimeStart} and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120) and q.type_code = #{typeCode} + and qct.check_type = #{checkType} From fd54baf7a80479eec36967cc63e8c86385270ece Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 4 Jan 2024 17:28:59 +0800 Subject: [PATCH 07/30] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9BUG=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/device/mapper/EquCheckItemMapper.java | 2 ++ .../com/op/device/service/impl/EquCheckItemServiceImpl.java | 2 +- .../src/main/resources/mapper/device/EquCheckItemMapper.xml | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java index 0e2a72971..72bdb7a39 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java @@ -32,6 +32,8 @@ public interface EquCheckItemMapper { */ public List selectEquCheckItemList(EquCheckItem equCheckItem); + public List selectPrecisionEquCheckItemList(EquCheckItem equCheckItem); + /** * 新增检查项维护 * diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java index af72ccf5d..286857487 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java @@ -165,7 +165,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { EquCheckItem checkQuery = new EquCheckItem(); checkQuery.setItemType(equCheckItemDTO.getItemType()); checkQuery.setItemName(equCheckItemDTO.getItemName()); - List check = equCheckItemMapper.selectEquCheckItemList(checkQuery); + List check = equCheckItemMapper.selectPrecisionEquCheckItemList(checkQuery); if (check.size()>0) { if (!check.get(0).getItemCode().equals(equCheckItemDTO.getItemCode())) { return error(500,"检查项已存在！不可修改！"); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml index c3f2095da..3a0f38087 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml @@ -57,6 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time DESC + + From 1225206e7384163edc374cb3836d0d2191380ceb Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jan 2024 17:48:26 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=94=B3=E9=A2=86?= =?UTF-8?q?=E5=8D=95=E5=8A=A0=E5=8D=95=E4=BB=B7=E6=80=BB=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/EquSpareApply.java | 22 +++++++++++++++++++ .../service/impl/DevicePDAServiceImpl.java | 7 +++--- .../impl/EquSpareApplyServiceImpl.java | 2 ++ .../mapper/device/EquSpareApplyMapper.xml | 14 ++++++++++-- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java index 30e6caed4..66a0b26e4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java @@ -114,6 +114,28 @@ public class EquSpareApply extends BaseEntity { @Excel(name = "物料描述") private String materialDesc; + /** 单价 */ + @Excel(name = "单价") + private BigDecimal unitPrice; + + /** 总价 */ + @Excel(name = "总价") + private BigDecimal totalPrice; + + public void setUnitPrice(BigDecimal unitPrice) { + this.unitPrice = unitPrice; + } + public BigDecimal getUnitPrice() { + return unitPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + public BigDecimal getTotalPrice() { + return totalPrice; + } + public void setMaterialCode(String materialCode) { this.materialCode = materialCode; } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index ffe5ad7d1..8d4d6e3e8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -782,6 +782,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; //工厂号 + //备件费用？？？？？ equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); equSpareApplyMapper.insertEquSpareApply(equSpareApply); @@ -832,9 +833,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { EquRepairWorkOrder example = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); // 费用 - BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); - BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); - equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); +// BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); +// BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); +// equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); //修改设备状态 由维修中改为正常运行 EquEquipment equEquipment = new EquEquipment(); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java index 8e17be26e..a40ad2149 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -95,6 +95,8 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { String code = applyList.getWorkCode(); applyList.setApplyCode("AW" + code.substring(2) + serialNum); } + //总价 +// applyList.setTotalPrice(applyList.getAmount().multiply(applyList.getUnitPrice())); //领用时间 applyList.setApplyTime(DateUtils.getNowDate()); //申领人 diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml index 5dd6de5c2..e55d87bc5 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml @@ -28,10 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_spare_apply + select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code , unit_price , total_price from equ_spare_apply select SUM(a.spare_quantity * w.unit_price) from equ_spare_apply a - left join wms_ods_mate_storage_news_attached w on a.spare_code = w.primary_code + left join wms_ods_mate_storage_news_attached w on a.spare_code = w.primary_code where a.work_code = #{orderCode} From 76f8261176f4f5ac08b2fe3f98a87fcdc4c93249 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 4 Jan 2024 18:48:53 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E4=B8=8D=E5=8F=AF=E6=96=B0=E5=A2=9EBUG=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/service/impl/EquCheckItemServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java index 286857487..0eca1f914 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java @@ -112,7 +112,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { EquCheckItem checkItem = new EquCheckItem(); checkItem.setItemType(equCheckItemDTO.getItemType()); checkItem.setItemName(equCheckItemDTO.getItemName()); - List check = equCheckItemMapper.selectEquCheckItemList(checkItem); + List check = equCheckItemMapper.selectPrecisionEquCheckItemList(checkItem); if (check.size() > 0) { return error(500, "检查项已存在！新增失败！"); } From 816efb1f5aba973563f8d9e092d449552bcaafec Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 5 Jan 2024 08:45:45 +0800 Subject: [PATCH 11/30] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/quality/QcStaticTableMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 faa8169c5..1078b7ab1 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 @@ -106,8 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_factory where f_type = 'c' From 62ee2492fce04c520733262c45edfe5b2e2a2796 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 5 Jan 2024 11:40:30 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2BUG=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysDatasourceMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml index e1c22cd15..211da1df5 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml @@ -66,8 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_datasource sud on sd.id = sud.datasource_id left join sys_user su on su.user_id = sud.user_id where sud.user_id is not null - - AND su.nick_name like concat('%', #{nickName}, '%') + + AND su.nick_name like concat('%', #{userName}, '%') AND sd.id = #{datasourceId} From da4f10f6038a26ba7a958b2deb02042bd815ff29 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Fri, 5 Jan 2024 14:03:26 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E9=A6=96=E6=A3=80=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcCheckReportFirstController.java | 185 ---------------- .../com/op/quality/domain/QcProjectType.java | 24 ++ .../service/IQcCheckReportFirstService.java | 78 ------- .../impl/QcCheckReportFirstServiceImpl.java | 207 ------------------ .../quality/QcCheckReportIncomeMapper.xml | 3 +- .../mapper/quality/QcProjectTypeMapper.xml | 13 +- 6 files changed, 38 insertions(+), 472 deletions(-) delete mode 100644 op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java delete mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java delete mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java deleted file mode 100644 index be6331364..000000000 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.op.quality.controller; - -import com.op.common.core.utils.DateUtils; -import com.op.common.core.utils.poi.ExcelUtil; -import com.op.common.core.web.controller.BaseController; -import com.op.common.core.web.domain.AjaxResult; -import com.op.common.core.web.page.TableDataInfo; -import com.op.common.log.annotation.Log; -import com.op.common.log.enums.BusinessType; -import com.op.common.security.annotation.RequiresPermissions; -import com.op.common.security.utils.SecurityUtils; -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckReportIncome; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcSupplier; -import com.op.quality.service.IQcCheckReportFirstService; -import com.op.system.api.domain.SysUser; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.List; - -/** - * 来料检验Controller - * - * @author Open Platform - * @date 2023-10-19 - */ -@RestController -@RequestMapping("/qcFirstReport") -public class QcCheckReportFirstController extends BaseController { - @Autowired - private IQcCheckReportFirstService qcCheckReportFirstService; - - /** - * 查询来料检验列表 - */ - @RequiresPermissions("quality:firstReport:list") - @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)+" 23:59:59"; - qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end - } - -// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ -// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start -// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end -// } - - startPage(); - List list = qcCheckReportFirstService.selectQcCheckReportIncomeList(qcCheckReportIncome); - return getDataTable(list); - } - - /** - * 导出来料检验列表 - */ - @RequiresPermissions("quality:firstReport:export") - @Log(title = "来料检验", businessType = BusinessType.EXPORT) - @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 - } - -// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ -// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start -// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end -// } - - List list = qcCheckReportFirstService.selectQcCheckReportIncomeList(qcCheckReportIncome); - ExcelUtil util = new ExcelUtil(QcCheckReportIncome.class); - util.exportExcel(response, list, "来料检验数据"); - } - - /** - * 获取来料检验详细信息 - */ - @RequiresPermissions("quality:firstReport:query") - @GetMapping(value = "/{recordId}") - public AjaxResult getInfo(@PathVariable("recordId") String recordId) { - return success(qcCheckReportFirstService.selectQcCheckReportIncomeByRecordId(recordId)); - } - - /** - * 新增来料检验 - */ - @RequiresPermissions("quality:firstReport:add") - @Log(title = "来料检验", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody QcCheckReportIncome qcCheckReportIncome) { - int r = qcCheckReportFirstService.insertQcCheckReportIncome(qcCheckReportIncome); - if(r>0){ - return toAjax(r); - } - return error("添加失败：请检查物料的关联检测项"); - } - - /** - * 修改来料检验 - */ - @RequiresPermissions("quality:firstReport:edit") - @Log(title = "来料检验", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody QcCheckReportIncome qcCheckReportIncome) { - return toAjax(qcCheckReportFirstService.updateQcCheckReportIncome(qcCheckReportIncome)); - } - - /** - * 删除来料检验 - */ - @RequiresPermissions("quality:firstReport:remove") - @Log(title = "来料检验", businessType = BusinessType.DELETE) - @DeleteMapping("/{recordIds}") - public AjaxResult remove(@PathVariable String[] recordIds) { - return toAjax(qcCheckReportFirstService.deleteQcCheckReportIncomeByRecordIds(recordIds)); - } - - /** - * 查询BOM物料管理列表 - */ - @GetMapping("/getQcListBom") - public TableDataInfo getQcListBom(QcBomComponent bomComponent) { - startPage(); - List list = qcCheckReportFirstService.getQcListBom(bomComponent); - return getDataTable(list); - } - /** - * 查询供应商列表 - */ - @GetMapping("/getQcListSupplier") - public TableDataInfo getQcListSupplier(QcSupplier qcSupplier) { - startPage(); - List list = qcCheckReportFirstService.getQcListSupplier(qcSupplier); - return getDataTable(list); - } - /** - * 查询人员列表 - */ - @GetMapping("/getQcListUser") - public TableDataInfo getQcListUser(SysUser sysUser) { - startPage(); - List list = qcCheckReportFirstService.getQcListUser(sysUser); - return getDataTable(list); - } - - /** - * 状态修改 - */ - @PutMapping("/changeIncomeStatus") - public AjaxResult changeIncomeStatus(@RequestBody QcCheckReportIncome qcCheckReportIncome) { - qcCheckReportIncome.setUpdateBy(SecurityUtils.getUsername()); - qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate()); - return toAjax(qcCheckReportFirstService.updateIncomeStatus(qcCheckReportIncome)); - } - - /** - * 检验项目弹窗列表 - * @param - * @return - */ - @GetMapping("/getCkeckProjectList") - public TableDataInfo getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - List list = qcCheckReportFirstService.getCkeckProjectList(qcCheckTaskDetail); - return getDataTable(list); - } -} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java index 5b63d8f17..eb549d765 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java @@ -36,6 +36,12 @@ public class QcProjectType extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; + @Excel(name = "检验标准") + private String standardNo; + + @Excel(name = "版本") + private String version; + public void setId(String id) { this.id = id; } @@ -79,6 +85,22 @@ public class QcProjectType extends BaseEntity { return delFlag; } + public String getStandardNo() { + return standardNo; + } + + public void setStandardNo(String standardNo) { + this.standardNo = standardNo; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -92,6 +114,8 @@ public class QcProjectType extends BaseEntity { .append("updateTime", getUpdateTime()) .append("factoryCode", getFactoryCode()) .append("delFlag", getDelFlag()) + .append("standard", getStandardNo()) + .append("version", getVersion()) .toString(); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java deleted file mode 100644 index 8b0de07ca..000000000 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.op.quality.service; - -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckReportIncome; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcSupplier; -import com.op.system.api.domain.SysUser; - -import java.util.List; - -/** - * 来料报告Service接口 - * - * @author Open Platform - * @date 2023-10-19 - */ -public interface IQcCheckReportFirstService { - /** - * 查询来料报告 - * - * @param recordId 来料报告主键 - * @return 来料检验 - */ - public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId); - - /** - * 查询来料报告列表 - * - * @param qcCheckReportIncome 来料报告 - * @return 来料检验集合 - */ - public List selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome); - - /** - * 新增来料报告 - * - * @param qcCheckReportIncome 来料报告 - * @return 结果 - */ - public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome); - - /** - * 修改来料报告 - * - * @param qcCheckReportIncome 来料报告 - * @return 结果 - */ - public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome); - - /** - * 批量删除来料报告 - * - * @param recordIds 需要删除的来料报告主键集合 - * @return 结果 - */ - public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds); - - /** - * 删除来料报告信息 - * - * @param recordId 来料报告主键 - * @return 结果 - */ - public int deleteQcCheckReportIncomeByRecordId(String recordId); - - public List getQcListBom(QcBomComponent bomComponent); - - public List getQcListSupplier(QcSupplier qcSupplier); - - public List getQcListUser(SysUser sysUser); - - int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome); - - List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail); - - public List getPrintData(QcCheckReportIncome qcCheckReportIncome); - -} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java deleted file mode 100644 index 1e243b338..000000000 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.op.quality.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.utils.DateUtils; -import com.op.common.core.utils.uuid.IdUtils; -import com.op.common.security.utils.SecurityUtils; -import com.op.quality.domain.*; -import com.op.quality.mapper.QcCheckReportIncomeMapper; -import com.op.quality.mapper.QcCheckTaskDetailMapper; -import com.op.quality.mapper.QcCheckTypeProjectMapper; -import com.op.quality.mapper.QcMaterialGroupDetailMapper; -import com.op.quality.service.IQcCheckReportFirstService; -import com.op.quality.service.IQcCheckReportIncomeService; -import com.op.system.api.domain.SysUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - -/** - * 来料检验Service业务层处理 - * - * @author Open Platform - * @date 2023-10-19 - */ -@Service -public class QcCheckReportFirstServiceImpl implements IQcCheckReportFirstService { - @Autowired - private QcCheckReportIncomeMapper qcCheckReportIncomeMapper; - - @Autowired - private QcCheckTypeProjectMapper qcCheckTypeProjectMapper; - - @Autowired - private QcMaterialGroupDetailMapper qcMaterialGroupDetailMapper; - - @Autowired - private QcCheckTaskDetailMapper qcCheckTaskDetailMapper; - - /** - * 查询来料检验 - * - * @param recordId 来料检验主键 - * @return 来料检验 - */ - @Override - @DS("#header.poolName") - public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { - return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); - } - - /** - * 查询来料检验列表 - * - * @param qcCheckReportIncome 来料检验 - * @return 来料检验 - */ - @Override - @DS("#header.poolName") - public List selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome) { - qcCheckReportIncome.setDelFlag("0"); - qcCheckReportIncome.setTypeCode("produce"); - qcCheckReportIncome.setCheckType("checkTypeSC"); - return qcCheckReportIncomeMapper.selectQcCheckReportIncomeList(qcCheckReportIncome); - } - - /** - * 新增来料检验 - * - * @param qcCheckReportIncome 来料检验 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) { - - String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); - int liushuiNum = qcCheckReportIncomeMapper.getTodayMaxNum(qcCheckReportIncome); - String liushuiStr = String.format("%04d", liushuiNum); - - String createBy = SecurityUtils.getUsername(); - Date nowDate= DateUtils.getNowDate(); - //获取当前所选工厂 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); - - qcCheckReportIncome.setCheckNo(bpDD+liushuiStr); - - /**qc_check_task_income**/ - String beLongId = IdUtils.fastSimpleUUID(); - qcCheckReportIncome.setRecordId(beLongId); - qcCheckReportIncome.setFactoryCode(factoryCode); - qcCheckReportIncome.setCreateTime(nowDate); - qcCheckReportIncomeMapper.insertQcCheckReportIncome(qcCheckReportIncome); - - /**取检测项**/ - QcCheckTypeProject qctp= new QcCheckTypeProject(); - qctp.setTypeId(qcCheckReportIncome.getCheckType());//生产过程检验 - qctp.setMaterialCode(qcCheckReportIncome.getMaterialCode());//特性 - /**qc_check_type_project**/ - List items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp); - if(CollectionUtils.isEmpty(items)){ - /**qc_material_group_detail**/ - QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckReportIncome.getMaterialCode()); - if(group == null){ - return 0;//没有找到检测项目 - } - qctp.setGroupId(group.getGroupId());//共性 - items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); - } - - /**qc_check_task_detail**/ - if(CollectionUtils.isEmpty(items)){ - return 0;//没有找到检测项目 - } - - for(QcCheckTaskDetail item:items){ - item.setRecordId(IdUtils.fastSimpleUUID()); - item.setBelongTo(beLongId); - item.setCreateTime(nowDate); - item.setCreateBy(createBy); - item.setFactoryCode(factoryCode); - item.setStatus("N"); - } - return qcCheckTaskDetailMapper.addBatch(items); - } - - /** - * 修改来料检验 - * - * @param qcCheckReportIncome 来料检验 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) { - qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate()); - return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome); - } - - /** - * 批量删除来料检验 - * - * @param recordIds 需要删除的来料检验主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds) { - return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordIds(recordIds); - } - - /** - * 删除来料检验信息 - * - * @param recordId 来料检验主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteQcCheckReportIncomeByRecordId(String recordId) { - return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordId(recordId); - } - - @Override - @DS("#header.poolName") - public List getQcListBom(QcBomComponent bomComponent) { - return qcCheckReportIncomeMapper.getQcListBom(bomComponent); - } - - @Override - @DS("#header.poolName") - public List getQcListSupplier(QcSupplier qcSupplier) { - return qcCheckReportIncomeMapper.getQcListSupplier(qcSupplier); - } - - @Override - @DS("master") - public List getQcListUser(SysUser sysUser) { - return qcCheckReportIncomeMapper.getQcListUser(sysUser); - } - - @Override - @DS("#header.poolName") - public int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome) { - return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome); - } - - @Override - @DS("#header.poolName") - public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); - } - - @Override - @DS("#header.poolName") - public List getPrintData(QcCheckReportIncome qcCheckReportIncome) { - return null; - } - -} 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 4b7f9f48c..f15925ab7 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 @@ -35,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name,sample_quality, - check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, + 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 diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml index fb48d98d4..95970101a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml @@ -15,10 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, project_type_code, project_type_name, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_project_type + select id, project_type_code, project_type_name, attr1, create_by, create_time, update_by, update_time, + factory_code, del_flag, standard_no, version from qc_project_type @@ -49,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, factory_code, del_flag, + standard_no, + version = #{version} #{id}, @@ -61,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{factoryCode}, #{delFlag}, + #{standardNo} + #{version} @@ -76,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, factory_code = #{factoryCode}, del_flag = #{delFlag}, + standard_no = #{standardNo}, + version = #{version}, where id = #{id} From 783150feedca1a9668be8e94b79a00022f073005 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 5 Jan 2024 15:40:41 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4BUG=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevicePDAController.java | 2 + .../service/impl/DevicePDAServiceImpl.java | 8 ++- .../mapper/device/EquOrderMapper.xml | 50 +++++++++++++++++-- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index c6bbdb7f3..8d4602a58 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -198,4 +198,6 @@ public class DevicePDAController extends BaseController { public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { return devicePDAService.selectEquFaultReasonList(equFaultReason); } + + } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 8d4d6e3e8..79cc9f176 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -366,7 +366,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService { // 费用 BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equOrder.getOrderCode()); BigDecimal orderCost = equOrder.getOrderCost(); - equOrder.setOrderCost(sparePartsCost.add(orderCost)); + if (orderCost!=null) { + if (sparePartsCost==null) { + equOrder.setOrderCost(orderCost); + }else { + equOrder.setOrderCost(sparePartsCost.add(orderCost)); + } + } // 更新设备状态为正常运行 equ.setStatus("1"); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index cefc46014..6f3e75311 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -48,6 +48,7 @@ + @@ -138,10 +139,51 @@ SELECT - report_code work_order, - product_code, - product_name, - unit unit_of_measure, - quantity plan_quantity + mes_report_work.report_code work_order, + pro_order_workorder.order_code product_order, + mes_report_work.product_code, + mes_report_work.product_name, + mes_report_work.unit unit_of_measure, + mes_report_work.batch batch_number, + mes_report_work.quantity plan_quantity, + (mes_report_work.quantity-put.put_quantity) attr3 FROM mes_report_work + LEFT JOIN ( + SELECT SUM + ( wms_product_put.put_quantity ) AS put_quantity, + wms_product_put.work_order AS work_order, + wms_product_put.product_code AS product_code FROM wms_product_put + GROUP BY + wms_product_put.work_order, + wms_product_put.product_code + ) put ON put.work_order=mes_report_work.report_code AND put.product_code=mes_report_work.product_code + LEFT JOIN pro_order_workorder ON pro_order_workorder.workorder_code=mes_report_work.workorder_code WHERE - report_code=#{workOrder} + mes_report_work.report_code=#{workOrder} and - parent_order = '0' - + mes_report_work.parent_order = '0' + + From 1f2dcfda473b6ff31ee5de56a21680db1e95c685 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 5 Jan 2024 16:29:17 +0800 Subject: [PATCH 16/30] =?UTF-8?q?PDA=E4=BB=BB=E5=8A=A1=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/device/EquOrderMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 6f3e75311..114dfa962 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -182,8 +182,10 @@ and eo.order_status != '1' and eo.order_code in (select order_code from equ_order_person - where del_flag = '0' and user_name = #{userId} + where del_flag = '0' + and user_name = #{userId} GROUP BY order_code) + order by eo.plan_loop_type, eo.plan_loop, eo.create_time, eo.equipment_code From 4a94e29ebaafe130430848a42935d86f777794c2 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 5 Jan 2024 17:28:24 +0800 Subject: [PATCH 18/30] =?UTF-8?q?PDA=E8=AF=A6=E6=83=85=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/device/EquOperationMapper.xml | 8 ++- .../mapper/device/EquOrderMapper.xml | 52 +++++++++++++++++-- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml index 14afae5ca..981c7e2ba 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml @@ -105,13 +105,17 @@ - - where equipment_id = #{equipmentId} + where equipment_code = #{equipmentCode} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml index 981c7e2ba..cad742854 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml @@ -265,6 +265,7 @@ where CONVERT(varchar,create_time,21) like concat('%',#{time}, '%') and equipment_code = #{equipmentCode} + and del_flag = '0' \ No newline at end of file From a91af79c92def20ffd6ac2ded4bc9faa0a755293 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 5 Jan 2024 21:28:38 +0800 Subject: [PATCH 20/30] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E7=8E=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcStaticTableController.java | 24 ++++++++++ .../com/op/quality/domain/QcStaticTable.java | 9 ++++ .../quality/mapper/QcStaticTableMapper.java | 5 ++ .../service/IQcStaticTableService.java | 5 ++ .../impl/QcStaticTableServiceImpl.java | 47 +++++++++++++++++-- .../mapper/quality/QcStaticTableMapper.xml | 30 ++++++++++++ 6 files changed, 115 insertions(+), 5 deletions(-) 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 17aaa5bfc..81c22991d 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 @@ -11,6 +11,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.op.common.core.utils.DateUtils; +import com.op.quality.domain.QcCheckType; import com.op.system.api.domain.quality.ChartDTO; import com.op.system.api.domain.quality.ChartSeriesDTO; import com.op.system.api.domain.quality.FactoryDto; @@ -228,6 +229,10 @@ public class QcStaticTableController extends BaseController { return qcStaticTableService.getWorkcenterList(factoryDto); } + @GetMapping("/getCheckTypeList/{typeCode}") + public List getCheckTypeList(@PathVariable("typeCode") String typeCode) { + return qcStaticTableService.getCheckTypeList(typeCode); + } /** * 巡检记录报表 */ @@ -266,4 +271,23 @@ public class QcStaticTableController extends BaseController { ChartSeriesDTO dto = qcStaticTableService.getXJChartData(qcStaticTable); return dto; } + + /**质检不良率统计**/ + @RequiresPermissions("quality:qcProduceAnalysis:list") + @GetMapping("/getQmsRateTable") + public TableDataInfo getQmsRateTable(QcStaticTable qcStaticTable) { + //默认时间范围T 00:00:00~T+1 00:00:00 + if(StringUtils.isEmpty(qcStaticTable.getYmArrayStart())){ + LocalDate date = LocalDate.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String ymStr = dtf.format(date); + qcStaticTable.setYmArrayStart(ymStr); + qcStaticTable.setYmArrayEnd(ymStr); + } + + startPage(); + List list = qcStaticTableService.getQmsRateTable(qcStaticTable); + return getDataTable(list); + } + } 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 66155a454..a230152f5 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 @@ -86,6 +86,15 @@ public class QcStaticTable extends BaseEntity { private String column200210; private String startDateStr; private String endDateStr; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } public String getStartDateStr() { return startDateStr; 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 d6dea4e39..17afffb63 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 @@ -3,6 +3,7 @@ package com.op.quality.mapper; import java.util.List; import java.util.Map; +import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcStaticTable; import com.op.system.api.domain.quality.FactoryDto; import org.apache.ibatis.annotations.MapKey; @@ -51,4 +52,8 @@ public interface QcStaticTableMapper { List getLegendData(QcStaticTable qcStaticTable); @MapKey("ymdms") Map getXJMapData(QcStaticTable qcStaticTable); + + List getQmsRateTable(QcStaticTable qcStaticTable); + + List getCheckTypeList(String typeCode); } 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 e769347cc..17196687e 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 @@ -3,6 +3,7 @@ package com.op.quality.service; import java.util.List; import java.util.Map; +import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcStaticTable; import com.op.system.api.domain.quality.ChartSeriesDTO; import com.op.system.api.domain.quality.FactoryDto; @@ -36,4 +37,8 @@ public interface IQcStaticTableService { List getXJCheckTableDetail(QcStaticTable qcStaticTable); ChartSeriesDTO getXJChartData(QcStaticTable qcStaticTable); + + List getQmsRateTable(QcStaticTable qcStaticTable); + + List getCheckTypeList(String typeCode); } 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 d70717243..7d9de9279 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 @@ -4,15 +4,11 @@ import java.math.BigDecimal; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; - import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; -import com.op.quality.domain.QcCheckTaskIncome; +import com.op.quality.domain.QcCheckType; import com.op.system.api.domain.quality.ChartDTO; import com.op.system.api.domain.quality.ChartSeriesDTO; import com.op.system.api.domain.quality.FactoryDto; @@ -319,6 +315,45 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return seriesDTO; } + @Override + @DS("#header.poolName") + public List getQmsRateTable(QcStaticTable qcStaticTable) { + List dtos = qcStaticTableMapper.getQmsRateTable(qcStaticTable); + for(QcStaticTable dto:dtos){ + if(StringUtils.isEmpty(dto.getOrderNo())){ + dto.setOrderNo("-"); + } + if(StringUtils.isEmpty(dto.getIncomeBatchNo())){ + dto.setIncomeBatchNo("-"); + } + if(StringUtils.isEmpty(dto.getMaterialCode())){ + dto.setMaterialCode("-"); + } + if(StringUtils.isEmpty(dto.getMaterialCode())){ + dto.setMaterialCode("-"); + } + if(StringUtils.isEmpty(dto.getMaterialName())){ + dto.setMaterialName("-"); + } + + if(StringUtils.isNotBlank(dto.getSampleQuality())&&!"0.00".equals(dto.getSampleQuality())){ + BigDecimal noOkRate = new BigDecimal(dto.getNoOkNums()) + .multiply(new BigDecimal(100)) + .divide(new BigDecimal(dto.getSampleQuality()),2,BigDecimal.ROUND_HALF_UP); + dto.setNoOkNumRate(noOkRate.toString()+"%"); + }else{ + dto.setNoOkNumRate("-"); + } + } + return dtos; + } + + @Override + @DS("#header.poolName") + public List getCheckTypeList(String typeCode) { + return qcStaticTableMapper.getCheckTypeList(typeCode); + } + private List getHourProductionTitle(QcStaticTable qcStaticTable) { // 返回的日期集合 @@ -349,4 +384,6 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return dayHours; } + + } 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 1078b7ab1..ce0a96b82 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 @@ -182,4 +182,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and qct.material_code like concat('%',#{materialCode},'%') group by qct.supplier_code,qct.supplier_name,CONVERT(VARCHAR(2), qct.check_time, 108) + + From 0f638c756f7439b26fc4ddd0b334aa5fe68d74fc Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Sat, 6 Jan 2024 00:53:23 +0800 Subject: [PATCH 21/30] =?UTF-8?q?wms=E4=BF=AE=E6=94=B917.2--=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/controller/WmsToWCSmissionController.java | 8 ++++---- .../java/com/op/wms/service/IWmsProductPutService.java | 4 ++++ .../op/wms/service/impl/OdsProcureOrderServiceImpl.java | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 06f196a3f..4ff5a911c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -97,10 +97,10 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc @PostMapping("/PurchaseOrderdeliPda") public AjaxResult PurchaseOrderdeliPda(@RequestBody OdsProcureOrder odsProcureOrder) { - odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); - return success(); -// int tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder); -// return success(tem); +// odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); +// return success(); + int tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder); + return success(tem); } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index 8f7a54b2f..3d8152ab0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -64,4 +64,8 @@ public interface IWmsProductPutService { public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder); public WmsProductPut WmsProductPutByWorkOrderquery(WmsProductPut wmsProductPut); + + String WmsProductPutByWorkOrderConfirm(WmsProductPut wmsProductPut); + + String WmsProductPutByWorkOrderConfirmSAPPosting(List wmsProductPut); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index df3322f82..f3304753e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -593,7 +593,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { odsProcureOutOrder.setUserDefined9(userDefined9); odsProcureOutOrder.setUserDefined10("2");//成功 odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder); - }else {// odsProcureOutOrder.setUserDefined9(""); odsProcureOutOrder.setUserDefined10("3");//失败 @@ -693,7 +692,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { qcCheckTaskIncomeDTO.setOrderType("bc"); qcCheckTaskIncomeDTO.setUnit("ST"); qcCheckTaskIncomeDTO.setQuality(new BigDecimal("10")); - qcCheckTaskIncomeDTO.setMaterialCode("000000040000015968"); + qcCheckTaskIncomeDTO.setMaterialCode("000000010900001055"); qcCheckTaskIncomeDTO.setMaterialName("榄菊植物力量蚊液（33mL+送12mL）*2瓶装纸盒(2201)"); qcCheckTaskIncomeDTO.setIncomeBatchNo("202312250001"); qcCheckTaskIncomeDTO.setOrderNo("4500297568"); From ba9216c14aee3f1020ec5ee18b77ce30fc7a66f0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 8 Jan 2024 14:00:32 +0800 Subject: [PATCH 22/30] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E7=8E=87=E7=BB=BC?= =?UTF-8?q?=E5=90=88=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcStaticTableController.java | 23 +++++++++++++++ .../com/op/quality/domain/QcStaticTable.java | 28 +++++++++++++------ .../quality/mapper/QcStaticTableMapper.java | 6 ++++ .../service/IQcStaticTableService.java | 2 ++ .../impl/QcStaticTableServiceImpl.java | 17 +++++++++++ .../mapper/quality/QcStaticTableMapper.xml | 16 +++++++++++ 6 files changed, 84 insertions(+), 8 deletions(-) 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 81c22991d..8fb6c60dd 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 @@ -11,6 +11,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.op.common.core.utils.DateUtils; +import com.op.quality.domain.QcCheckProject; import com.op.quality.domain.QcCheckType; import com.op.system.api.domain.quality.ChartDTO; import com.op.system.api.domain.quality.ChartSeriesDTO; @@ -233,6 +234,12 @@ public class QcStaticTableController extends BaseController { public List getCheckTypeList(@PathVariable("typeCode") String typeCode) { return qcStaticTableService.getCheckTypeList(typeCode); } + + @GetMapping("/getSupplierList/{typeCode}") + public List getSupplierList(@PathVariable("typeCode") String typeCode) { + return qcStaticTableService.getSupplierList(typeCode); + } + /** * 巡检记录报表 */ @@ -290,4 +297,20 @@ public class QcStaticTableController extends BaseController { return getDataTable(list); } + @PostMapping("/exportProduceAnalysis") + public void exportProduceAnalysis(HttpServletResponse response, QcStaticTable qcStaticTable) { + //默认时间范围T 00:00:00~T+1 00:00:00 + if(StringUtils.isEmpty(qcStaticTable.getYmArrayStart())){ + LocalDate date = LocalDate.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String ymStr = dtf.format(date); + qcStaticTable.setYmArrayStart(ymStr); + qcStaticTable.setYmArrayEnd(ymStr); + } + + List list = qcStaticTableService.getQmsRateTable(qcStaticTable); + ExcelUtil util = new ExcelUtil(QcStaticTable.class); + util.exportExcel(response, list, "质检不良统计"); + } + } 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 a230152f5..cade73b8d 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 @@ -21,10 +21,10 @@ public class QcStaticTable extends BaseEntity { private String supplierId; - @Excel(name = "供应商编号") + @Excel(name = "单位编码") private String supplierCode; - @Excel(name = "供应商名称") + @Excel(name = "单位名称") private String supplierName; private List supplierCodes; @@ -36,19 +36,34 @@ public class QcStaticTable extends BaseEntity { private int noOkBatchs; private int nums; private int okNums; - private int noOkNums; + private String typeCode; private String checkResult; private String noOkBatchRate; - private String noOkNumRate; + private String ymArrayStart; private String ymArrayEnd; private List legendData; private List xAxis; private List series; + @Excel(name = "订单编码") + private String orderNo; + @Excel(name = "批次") + private String incomeBatchNo; + @Excel(name = "产品编码") private String materialCode; + @Excel(name = "产品名称") private String materialName; + @Excel(name = "数量") + private String quality; + @Excel(name = "单位") + private String unit; + @Excel(name = "抽样数量") private String sampleQuality; + @Excel(name = "不良数量") + private int noOkNums; + @Excel(name = "不良比例") + private String noOkNumRate; private BigDecimal aNoOkquality; private BigDecimal bNoOkquality; private BigDecimal cNoOkquality; @@ -59,10 +74,7 @@ public class QcStaticTable extends BaseEntity { private String recordId; private String checkNo; - private String orderNo; - private String incomeBatchNo; - private String quality; - private String unit; + @JsonFormat(pattern = "yyyy-MM-dd") private Date incomeTime; private String checkManCode; 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 17afffb63..7d4cbc8b7 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 @@ -56,4 +56,10 @@ public interface QcStaticTableMapper { List getQmsRateTable(QcStaticTable qcStaticTable); List getCheckTypeList(String typeCode); + + List getSupplier(); + + List getLocList(); + + List getWorkcenter(); } 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 17196687e..d60c07e39 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 @@ -41,4 +41,6 @@ public interface IQcStaticTableService { List getQmsRateTable(QcStaticTable qcStaticTable); List getCheckTypeList(String typeCode); + + List getSupplierList(String typeCode); } 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 7d9de9279..e01b94484 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 @@ -354,6 +354,23 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return qcStaticTableMapper.getCheckTypeList(typeCode); } + @Override + @DS("#header.poolName") + public List getSupplierList(String typeCode) { + List dtos = null; + if("produce".equals(typeCode)){ + //工作中心 + dtos = qcStaticTableMapper.getWorkcenter(); + }else if("product".equals(typeCode)){ + //仓库 + dtos = qcStaticTableMapper.getLocList(); + }else if("material".equals(typeCode)){ + //供应商 + dtos = qcStaticTableMapper.getSupplier(); + } + return dtos; + } + private List getHourProductionTitle(QcStaticTable qcStaticTable) { // 返回的日期集合 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 ce0a96b82..6379bb687 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 @@ -212,4 +212,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from qc_check_type where del_flag = '0' and type_code= #{typeCode} + + + From f349941a940e949377b47abd0d7e9eefb7e060c2 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 8 Jan 2024 18:05:52 +0800 Subject: [PATCH 23/30] =?UTF-8?q?PDA=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/device/EquOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 2fe00c629..af0d332bf 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -185,7 +185,7 @@ where del_flag = '0' and user_name = #{userId} GROUP BY order_code) - order by eo.plan_loop_type, eo.plan_loop, eo.create_time, eo.equipment_code + order by eo.plan_loop_type, eo.plan_loop, eo.create_time desc, eo.equipment_code SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_description - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + WHERE del_flag = '0' \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml index eaafe629a..6f98ab3b2 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' + ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER) SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_measures - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + WHERE del_flag = '0' \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml index 10b95ba12..431465fc1 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml @@ -45,11 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' + ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER) @@ -122,6 +125,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml index b9268d5f0..99fc05b3c 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -50,7 +50,7 @@ and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' - ORDER BY create_time DESC + ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER) SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_type - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + WHERE del_flag = '0' From 8a8cdaaed43b70be771c095e55f7f0676f4717b3 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 9 Jan 2024 11:24:07 +0800 Subject: [PATCH 28/30] =?UTF-8?q?2024-1-9-2=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E5=B7=A5=E5=8E=82-=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/device/EquFaultReasonMapper.xml | 2 -- .../src/main/java/com/op/wms/domain/SysFactory.java | 11 +++++++++++ .../main/resources/mapper/wms/SysFactoryMapper.xml | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml index 431465fc1..4d1539d2d 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml @@ -51,8 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java index 5b78ff86a..d47e38948 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java @@ -47,6 +47,10 @@ public class SysFactory extends TreeEntity { @Excel(name = "工厂编码") private String factoryCode; + /** 工厂建模类型 */ + @Excel(name = "工厂建模类型") + private String fType; + //虚拟字段 private List> workCenter; private String value; @@ -111,6 +115,13 @@ public class SysFactory extends TreeEntity { this.factoryCode = factoryCode; } + public String getFType() { + return fType; + } + public void setFType(String fType) { + this.fType = fType; + } + public String getValue() { return value; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml index f8f26d4e9..72b70fd88 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml @@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag from sys_factory + select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag , f_type from sys_factory @@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, factory_code, + f_type, #{parentId}, @@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{factoryCode}, + #{fType}, @@ -102,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, factory_code = #{factoryCode}, + f_type = #{fType}, where factory_id = #{factoryId} From fc507735c75d2a194fed2499a72c7811814be080 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 9 Jan 2024 14:09:36 +0800 Subject: [PATCH 29/30] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/mes/MesMapper.xml | 6 +- .../QcCheckReportProduceController.java | 12 ++- .../quality/domain/QcCheckReportIncome.java | 9 ++ .../op/quality/domain/QcCheckTaskProduce.java | 20 ++++ .../mapper/QcCheckReportIncomeMapper.java | 2 + .../mapper/QcCheckTaskProduceMapper.java | 9 ++ .../impl/QcCheckReportProduceServiceImpl.java | 23 ++-- .../quality/QcCheckReportIncomeMapper.xml | 31 ++++-- .../quality/QcCheckTaskProduceMapper.xml | 100 +++++++++++++++++- 9 files changed, 186 insertions(+), 26 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 6656b4425..38a294a90 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -118,9 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" equ.equipment_type_code select qct.record_id, qct.check_no, qct.income_batch_no, - qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, - qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, - qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,qct.sample_quality, - qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, - q.type_code,q.check_name + qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, + qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, + qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,qct.sample_quality, + qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, + q.type_code,q.check_name from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -143,8 +143,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join qc_check_type_project qctp on td.type_project_id = qctp.id where td.belong_to = #{recordId} + - + insert into qc_check_task record_id, 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 77edb220d..31eb4ce1d 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 @@ -11,9 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + @@ -35,9 +33,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -266,4 +299,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + From 98084eaf1ef196f7cc7ec0b46e8f5793e4bded77 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 9 Jan 2024 14:12:39 +0800 Subject: [PATCH 30/30] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/service/IQcCheckReportProduceService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 d3adf69af..587c4f618 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 @@ -1,9 +1,6 @@ package com.op.quality.service; -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckReportIncome; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcSupplier; +import com.op.quality.domain.*; import com.op.system.api.domain.SysUser; import java.util.List; @@ -73,5 +70,5 @@ public interface IQcCheckReportProduceService { List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail); - public List getPrintData(QcCheckReportIncome qcCheckReportIncome); + QcCheckTaskProduce getProduceReportXJ(QcCheckTaskProduce qcCheckTaskProduce); }