From fb4349d95076843433e0c7ff5779860b58fac530 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 12 Aug 2024 08:48:51 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=88=90=E5=93=81=E6=89=AB=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E5=8D=A1=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OdsProcureOrderController.java | 2 + .../controller/WmsToWCSmissionController.java | 9 ++++- .../java/com/op/wms/domain/WmsProductPut.java | 37 +++++++++++++++++++ .../op/wms/mapper/WmsProductPutMapper.java | 1 + .../op/wms/service/IWmsProductPutService.java | 2 + .../impl/OdsProcureOrderServiceImpl.java | 2 +- .../impl/WmsProductPutServiceImpl.java | 16 ++++++++ .../mapper/wms/WmsProductPutMapper.xml | 30 +++++++++++++++ 8 files changed, 97 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java index 6fe0b4844..dbd70fd02 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java @@ -320,6 +320,8 @@ public class OdsProcureOrderController extends BaseController { odsProcureOrderService.OutboundPostingSAPfc(orderList); return success(); } + + @PostMapping("/listCKT") public AjaxResult listCKT(BaseWarehouse baseWarehouse) { 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 a2c142438..dba3ced1b 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 @@ -300,7 +300,14 @@ public class WmsToWCSmissionController { public AjaxResult WmsProductPutByWorkOrderquery(@RequestBody WmsProductPut wmsProductPut) { return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderquery(wmsProductPut)); } - + /** + * 成品 + * 手持接口：根据报工单号查询－－新---改成扫标识卡 + */ + @PostMapping("/WmsProductPutByWorkOrderqueryBS") + public AjaxResult WmsProductPutByWorkOrderqueryBS(@RequestBody WmsProductPut wmsProductPut) { + return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut)); + } /** * 成品 * 手持接口：确认 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java index 31f815e5d..0a72018c1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java @@ -217,6 +217,43 @@ public class WmsProductPut extends BaseEntity { List wmsProductPut; private String sn; + private String pallet;//标识卡 + + public String getPallet() { + return pallet; + } + private String attribute1 ; + private String attribute2; + private String attribute3; + + public String getAttribute1() { + return attribute1; + } + + public void setAttribute1(String attribute1) { + this.attribute1 = attribute1; + } + + public String getAttribute2() { + return attribute2; + } + + public void setAttribute2(String attribute2) { + this.attribute2 = attribute2; + } + + public String getAttribute3() { + return attribute3; + } + + public void setAttribute3(String attribute3) { + this.attribute3 = attribute3; + } + + public void setPallet(String pallet) { + this.pallet = pallet; + } + public String getSn() { return sn; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 763c01185..867136fe4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -77,6 +77,7 @@ public interface WmsProductPutMapper { void updateWmsProductPutByIds(@Param("wmsProductPut") WmsProductPut wmsProductPut4, @Param("list") List wmsProductPut2); + WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut); // String selectWmsProductPutNum(wmsReportWork wmsReportWork); 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 6535ef551..832bad7a3 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 @@ -138,4 +138,6 @@ public interface IWmsProductPutService { Integer finishedProductProductionRecords(ProOrderWorkorder proOrderWorkorder); List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords); + + WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut 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 479b7ad07..aef6dcfc5 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 @@ -854,7 +854,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { if (ruslt.getCode()==200){//成功 odsProcureOrderMapper.updateOdsProcureOrderAddOperationNumber(odsProcureOrder); }else { - result="操作失败"; + result="操作失败:"+ruslt.getMsg(); } return result; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 8c8a70e6f..d29686c8a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1028,6 +1028,22 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return records; } + @Override + public WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut) { + // 使用 split 方法根据 '-' 分割字符串，结果是一个字符串数组 + DynamicDataSourceContextHolder.push("ds_" + wmsProductPut.getFactoryCode()); + String[] attributes = wmsProductPut.getPallet().split("-"); + // 通过索引访问分割后的数组，获取所需的三个属性 + String attribute1 = attributes[0]; // 获取第一个属性 + String attribute2 = attributes[1]; // 获取第二个属性 + String attribute3 = attributes[2]; // 获取第三个属性 + wmsProductPut.setAttribute1(attribute1); + wmsProductPut.setAttribute2(attribute2); + wmsProductPut.setAttribute3(attribute3); + WmsProductPut wmsProductPut1 = wmsProductPutMapper.WmsProductPutByWorkOrderqueryBS(wmsProductPut); + return wmsProductPut1; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 07564a799..d05605abb 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -384,5 +384,35 @@ #{item.id} + From dffd9907703078ef6648268900fe270f8998acfd Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 12 Aug 2024 16:16:29 +0800 Subject: [PATCH 02/13] del_flag bug --- .../src/main/resources/mapper/mes/MesPrepareDetailMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml index ae78454a2..9fe5b0b8d 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml @@ -82,7 +82,7 @@ from pro_order_workorder ow left join mes_prepare mp on ow.workorder_code = mp.workorder_code left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id - where ow.belong_work_order = #{workorderCode} + where ow.belong_work_order = #{workorderCode} and ow.del_flag = '0' and mpd.recoil = #{recoil} and mp.del_flag = '0' and mpd.del_flag = '0' order by mpd.recoil From 2d0d6f878143fbd3bb057f3fdc78d3b286c5f6a4 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 12 Aug 2024 22:01:24 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/domain/MesReportWorkConsume.java | 9 +++++++++ .../com/op/mes/mapper/MesReportWorkConsumeMapper.java | 3 +++ .../service/impl/MesReportWorkConsumeServiceImpl.java | 6 ++++++ .../resources/mapper/mes/MesReportWorkConsumeMapper.xml | 3 +++ .../main/resources/mapper/mes/MesReportWorkMapper.xml | 1 + .../service/impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../service/impl/QcCheckUnqualifiedServiceImpl.java | 9 +++++---- 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java index a75a09c4a..3861064c5 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java @@ -93,6 +93,7 @@ public class MesReportWorkConsume extends BaseEntity { @Excel(name = "报工编码") private String reportCode; + private BigDecimal quantityFeedback; //虚拟字段 private String id; private String parentOrder; @@ -117,6 +118,14 @@ public class MesReportWorkConsume extends BaseEntity { private String erfmg; private String erfme; + public BigDecimal getQuantityFeedback() { + return quantityFeedback; + } + + public void setQuantityFeedback(BigDecimal quantityFeedback) { + this.quantityFeedback = quantityFeedback; + } + public String getErfmg() { return erfmg; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java index a45a914b2..d6f69ff54 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java @@ -1,5 +1,6 @@ package com.op.mes.mapper; +import java.math.BigDecimal; import java.util.List; import com.op.mes.domain.MesReportWorkConsume; @@ -85,4 +86,6 @@ public interface MesReportWorkConsumeMapper { List getSumConsumeList(MesReportWorkConsume consumeqo); int getSumConsumeListNum(MesReportWorkConsume consumeqo); + + BigDecimal getActAllProduct(MesReportWorkConsume mesReportWorkConsume); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 8d49d1a7a..44a56bb09 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -358,6 +358,12 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer pTabs.setTitle("第"+i+"层工单物料损耗"); mesReportWorkConsume.setParentOrder("0"); List liblist0 = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume); + + if(!CollectionUtils.isEmpty(liblist0)){ + BigDecimal actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume); + liblist0.get(0).setQuantityFeedback(actPro); + } + pTabs.setLibList(liblist0); tabs.add(pTabs); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 2c9f01f26..f5b9d049d 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -202,6 +202,9 @@ and mrw.machine_code = #{machineCode} )t + insert into mes_report_work_consume diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 68509b2ba..d132b6be6 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -702,6 +702,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and CONVERT(varchar(10), #{productDateEnd}, 23) >= CONVERT(varchar(10),pow.product_date, 23) + and pow.product_code like concat('%', #{productCode}, '%') order by be.equipment_code 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 bc79d2441..8bb7e041e 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 @@ -927,7 +927,7 @@ public class QcCheckTaskIncomeServiceImpl implements private void setOaFunc(QcCheckUnqualified unqualified,QcCheckTaskIncome qcCheckTaskIncome){ //不合格描述 unqualified.setRemark(qcCheckTaskIncome.getRemark()); - if("produce".equals(qcCheckTaskIncome.getTypeCode())){ + if("produce".equals(qcCheckTaskIncome.getTypeCode())||"product".equals(qcCheckTaskIncome.getTypeCode())){ unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode()); unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); unqualified.setUser(qcCheckTaskIncome.getPgzg());//qcCheckTaskIncome.getUpdateBy(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index f014a93ce..7c4b31480 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -100,13 +100,14 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService if("material".equals(taskIfo.getTypeCode())) { //ZL0010-来料检验不合格控制流程 oaR = this.createLLOA(taskIfo); - }else if("produce".equals(taskIfo.getTypeCode())){ + }else if("produce".equals(taskIfo.getTypeCode())||"product".equals(taskIfo.getTypeCode())){ //ZL0030-品质异常流程 oaR = this.createProduceOA(taskIfo); - }else if("product".equals(taskIfo.getTypeCode())) { - //ZL0020-成品检验控制流程 - oaR = this.createProductOA(taskIfo); } +// else if("product".equals(taskIfo.getTypeCode())) { +// //ZL0020-成品检验控制流程 +// oaR = this.createProductOA(taskIfo); +// } if(oaR!=null ){ if((oaR.get("code").toString()).equals("200")){ /**qc_check_unqualified**/ From 3f7dc37ea8df88643c9fbd3fd4af5f2576fd1236 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 13 Aug 2024 09:25:21 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/controller/QuaController.java | 13 ++ .../mapper/QcCheckTaskIncomeMapper.java | 7 + .../op/quality/service/QcProCheckService.java | 2 + .../impl/QcCheckTaskIncomeServiceImpl.java | 59 ++++- .../service/impl/QcProCheckServiceImpl.java | 34 +++ .../quality/QcCheckTaskIncomeMapper.xml | 214 ++++++++++++++++++ 6 files changed, 325 insertions(+), 4 deletions(-) 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 c81f2d185..78e96367e 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 @@ -174,6 +174,19 @@ public class QuaController extends BaseController { } return success(qcProCheckService.getCheckTaskDetailList(qcCheckTaskDetail)); } + /** + * 获取回显 + */ + @GetMapping(value = "getCheckTaskDetailListCg") + public AjaxResult getCheckTaskDetailListCg(QcCheckTaskDetail qcCheckTaskDetail) { + if(StringUtils.isBlank(qcCheckTaskDetail.getFactoryCode())){ + return error("[factoryCode]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskDetail.getBelongTo())){ + return error("[belongTo]不能为空"); + } + return success(qcProCheckService.getCheckTaskDetailListCg(qcCheckTaskDetail)); + } /** * 自动取称的数据 */ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index b65034057..4078474e2 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -47,6 +47,8 @@ public interface QcCheckTaskIncomeMapper { */ public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome); + int insertQcCheckTaskIncomeCg(QcCheckTaskIncome qcCheckTaskIncome); + /** * 修改来料检验 * @@ -82,6 +84,9 @@ public interface QcCheckTaskIncomeMapper { List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail); int updateQcCheckTask(QcCheckTaskIncome qcCheckTask); + int updateQcCheckTaskCg(QcCheckTaskIncome qcCheckTask); + + List selectQcCheckTaskCgByRecordId(String recordId); int updateQcCheckTaskDetails(@Param("list") List details); @@ -107,6 +112,8 @@ public interface QcCheckTaskIncomeMapper { QcCheckTaskIncome getTaskInfo(String recordId); + QcCheckTaskIncome getTaskInfoCg(String recordId); + int deleteQcCheckTaskDefects(String belongId); List getCkeckTaskXJList(QcCheckTaskIncome qcCheckTaskIncome); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java index dbdd51591..2b3c538ea 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java @@ -47,4 +47,6 @@ public interface QcProCheckService { String getWeightInfo(QcCheckTaskDetail qcCheckTaskDetail); QcCheckTaskDetail getAutoJudge(QcCheckTaskDetail qcCheckTaskDetail); + + QcCheckTaskIncome getCheckTaskDetailListCg(QcCheckTaskDetail qcCheckTaskDetail); } 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 bc79d2441..f38bbbfb2 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 @@ -432,7 +432,7 @@ public class QcCheckTaskIncomeServiceImpl implements detail.setFileUrls(urls); } } - return dtos; + return dtos; } @Override @@ -610,7 +610,7 @@ public class QcCheckTaskIncomeServiceImpl implements public List getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome) { List dtos = qcCheckTaskIncomeMapper.getCkeckTaskXJList(qcCheckTaskIncome); for(QcCheckTaskIncome dto:dtos){ - //不良分类 + //不良分类 QcCheckTaskDefect defectqo = new QcCheckTaskDefect(); defectqo.setBelongTo(dto.getRecordId()); List defects = qcCheckTaskDefectMapper.selectQcCheckTaskDefectList(defectqo); @@ -690,8 +690,58 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); qcCheckTask.setReason(qcCheckTaskIncome.getReason()); qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注 + + qcCheckTask.setStartOA(qcCheckTaskIncome.getStartOA()); + qcCheckTask.setTypeCode(qcCheckTaskIncome.getTypeCode()); + + + /* 来料草稿 */ + qcCheckTask.setOaFactory(qcCheckTaskIncome.getOaFactory()); + qcCheckTask.setSupplierCode(qcCheckTaskIncome.getSupplierCode()); + qcCheckTask.setSupplierName(qcCheckTaskIncome.getSupplierName()); + qcCheckTask.setCzbjr(qcCheckTaskIncome.getCzbjr()); + qcCheckTask.setZcf(qcCheckTaskIncome.getZcf()); + qcCheckTask.setZcoemcm(qcCheckTaskIncome.getZcoemcm()); + qcCheckTask.setQczg(qcCheckTaskIncome.getQczg()); + qcCheckTask.setQuality(qcCheckTaskIncome.getQuality()); + qcCheckTask.setUnit(qcCheckTaskIncome.getUnit()); + qcCheckTask.setMaterialType(qcCheckTaskIncome.getMaterialType()); + qcCheckTask.setMaterialFrom(qcCheckTaskIncome.getMaterialFrom()); + + /* 巡检草稿 */ + qcCheckTask.setSqbm(qcCheckTaskIncome.getSqbm());// 所属部门 + qcCheckTask.setCheckLoc(qcCheckTaskIncome.getCheckLoc()); // 发现地点 + qcCheckTask.setOaFactoryF(qcCheckTaskIncome.getOaFactoryF());// 异常范围 + qcCheckTask.setSfxyzg(qcCheckTaskIncome.getSfxyzg());// 是否需要主管审核 + qcCheckTask.setPgzg(qcCheckTaskIncome.getPgzg());// QC主管 + qcCheckTask.setPgzr(qcCheckTask.getPgzr()); // 质量主管 + qcCheckTask.setSfgyswt(qcCheckTaskIncome.getSfgyswt());// 是否供应商 + qcCheckTask.setSccj(qcCheckTaskIncome.getSccj());// 所属车间 + qcCheckTask.setSqr(qcCheckTaskIncome.getSqr());// 申请人Id + /**qc_check_task_cg**/ - n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);//updateQcCheckTaskCG + List valiData = qcCheckTaskIncomeMapper.selectQcCheckTaskCgByRecordId(belongId); + // 判断表中是否存在此条数据 + if (valiData != null && valiData.size() > 0) { + n = qcCheckTaskIncomeMapper.updateQcCheckTaskCg(qcCheckTask);//updateQcCheckTaskCG + }else { + qcCheckTask.setCheckNo(qcCheckTaskIncome.getCheckNo()); + qcCheckTask.setOrderNo(qcCheckTaskIncome.getOrderNo()); + qcCheckTask.setMaterialCode(qcCheckTaskIncome.getMaterialCode()); + qcCheckTask.setMaterialName(qcCheckTaskIncome.getMaterialName()); + qcCheckTask.setOrderType(qcCheckTaskIncome.getOrderType()); + qcCheckTask.setOrderTypeDesc(qcCheckTaskIncome.getOrderTypeDesc()); + qcCheckTask.setCreateBy(qcCheckTaskIncome.getCreateBy()); + qcCheckTask.setCreateTime(DateUtils.getNowDate()); + qcCheckTask.setFactoryCode(qcCheckTaskIncome.getFactoryCode()); + qcCheckTask.setCheckType(qcCheckTaskIncome.getCheckType()); + + qcCheckTask.setaNoOkquality(qcCheckTaskIncome.getaNoOkquality()); + qcCheckTask.setbNoOkquality(qcCheckTaskIncome.getbNoOkquality()); + qcCheckTask.setcNoOkquality(qcCheckTaskIncome.getcNoOkquality()); + + n = qcCheckTaskIncomeMapper.insertQcCheckTaskIncomeCg(qcCheckTask); + } logger.info("qc_check_task:"+n); /**更新qc_check_task_detail**/ for(QcCheckTaskDetail detail:details){ @@ -921,7 +971,7 @@ public class QcCheckTaskIncomeServiceImpl implements return 1 ; } - /* 首检巡检都是品质异常流程 + /* 首检巡检都是品质异常流程 * 成品的是成品检验控制流程 * 来料的是来料检验不合格流程*/ private void setOaFunc(QcCheckUnqualified unqualified,QcCheckTaskIncome qcCheckTaskIncome){ @@ -1052,6 +1102,7 @@ public class QcCheckTaskIncomeServiceImpl implements //发企业微信--------------------结束 } } + //CAR:0 PC:1 其它：2 吨：3 千克：4 protected String getConvertUnit(String unit){ String unitOa= ""; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index 8fe9c061c..9fbffd847 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -173,6 +173,40 @@ public class QcProCheckServiceImpl implements QcProCheckService { return dto; } + @Override + public QcCheckTaskIncome getCheckTaskDetailListCg(QcCheckTaskDetail qcCheckTaskDetail) { + DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode()); + QcCheckTaskIncome dto = qcCheckTaskIncomeMapper.getTaskInfoCg(qcCheckTaskDetail.getBelongTo()); + if (dto == null) { + return null; + } + List qcCheckTaskDetails = qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); + /**qc_check_task_defect**/ + Map defectMap = qcCheckTaskDefectMapper.getDefectMap(qcCheckTaskDetail); + + for (QcCheckTaskDetail qcd : qcCheckTaskDetails) { + List files = qmsFileMapper.getBaseFileBatch(qcd.getRecordId()); + if (CollectionUtils.isNotEmpty(files)) { + qcd.setFiles(files); + } + + QcCheckTaskDefect defectInfo = defectMap.get(qcd.getRecordId()); + if(defectInfo != null){ + qcd.setDefectCodes(defectInfo.getDefectCodes()); + qcd.setDefectNames(defectInfo.getDefectNames()); + qcd.setDefectQualitys(defectInfo.getDefectQualitys()); + } + } + + dto.setQcCheckTaskDetails(qcCheckTaskDetails); + List defects = qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail); + if (CollectionUtils.isEmpty(defects)) { + defects = qcCheckTaskIncomeMapper.getDefectType(qcCheckTaskDetail); + } + dto.setDefects(defects); + + return dto; + } @Override @DS("master") diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index a363ca2d9..4159ccc06 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -320,6 +320,178 @@ update_time = #{updateTime} where record_id = #{recordId} + + + insert into qc_check_task_cg + + record_id, + check_no, + income_batch_no, + order_no, + material_code, + material_name, + quality, + noOk_quality, + unit, + supplier_code, + supplier_name, + income_time, + check_loc, + check_status, + check_man_code, + check_man_name, + check_time, + check_result, + status, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + check_type, + type_code, + sample_quality, + order_type, + order_type_desc, + remark, + reason, + bz, + start_oA, + oa_factory, + material_type, + material_from, + czbjr, + zcf, + zcoemcm, + qczg, + sqr, + sqbm, + oa_factory_f, + sfxyzg, + pgzg, + pgzr, + sfgyswt, + sccj, + aNoOkquality, + bNoOkquality, + cNoOkquality, + + + #{recordId}, + #{checkNo}, + #{incomeBatchNo}, + #{orderNo}, + #{materialCode}, + #{materialName}, + #{quality}, + #{noOkQuality}, + #{unit}, + #{supplierCode}, + #{supplierName}, + #{incomeTime}, + #{checkLoc}, + #{checkStatus}, + #{checkManCode}, + #{checkManName}, + #{checkTime}, + #{checkResult}, + #{status}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + #{checkType}, + #{typeCode}, + #{sampleQuality}, + #{orderType}, + #{orderTypeDesc}, + #{remark}, + #{reason}, + #{bz}, + #{startOA}, + #{oaFactory}, + #{materialType}, + #{materialFrom}, + #{czbjr}, + #{zcf}, + #{zcoemcm}, + #{qczg}, + #{sqr}, + #{sqbm}, + #{oaFactoryF}, + #{sfxyzg}, + #{pgzg}, + #{pgzr}, + #{sfgyswt}, + #{sccj}, + #{aNoOkquality}, + #{bNoOkquality}, + #{cNoOkquality}, + + + + + update qc_check_task_cg + set + check_status = #{checkStatus}, + check_man_code = #{checkManCode}, + check_man_name =#{checkManName}, + check_time = #{checkTime}, + sample_quality = #{sampleQuality}, + noOk_quality = #{noOkQuality}, + aNoOkquality = #{aNoOkquality}, + bNoOkquality = #{bNoOkquality}, + cNoOkquality = #{cNoOkquality}, + income_batch_no = #{incomeBatchNo}, + remark = #{remark}, + reason = #{reason}, + bz = #{bz}, + start_oA = #{startOA}, + oa_factory = #{oaFactory}, + material_type = #{materialType}, + material_from = #{materialFrom}, + czbjr = #{czbjr}, + zcf = #{zcf}, + zcoemcm = #{zcoemcm}, + qczg = #{qczg}, + sqr = #{sqr}, + quality = #{quality}, + unit = #{unit}, + sqbm = #{sqbm}, + check_loc = #{checkLoc}, + oa_factory_f = #{oaFactoryF}, + sfxyzg = #{sfxyzg}, + pgzg = #{pgzg}, + pgzr = #{pgzr}, + sfgyswt = #{sfgyswt}, + sccj = #{sccj}, + check_result = #{checkResult}, + update_by = #{updateBy}, + update_time = #{updateTime} + where record_id = #{recordId} + + + + update qc_check_task_detail @@ -421,6 +593,48 @@ left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0' where qct.record_id = #{recordId} + + and order_code like concat('%', #{orderCode}, '%') - and equipment_code like concat('%', - #{equipmentCode}, '%') - + and equipment_code like concat('%',#{equipmentCode}, '%') and order_desc like concat('%', #{orderDesc}, '%') - and CONVERT(date,order_breakdown_time) >= - #{orderBreakdownTimeStart} - - and #{orderBreakdownTimeEnd} >= - CONVERT(date,order_breakdown_time) - - and order_source like concat('%', #{orderSource}, - '%') - + and CONVERT(date,order_breakdown_time) >= #{orderBreakdownTimeStart} + and #{orderBreakdownTimeEnd} >= CONVERT(date,order_breakdown_time) + and order_source like concat('%', #{orderSource},'%') and CONVERT(date,order_time) >= #{orderTimeStart} and #{orderTimeEnd} >= CONVERT(date,order_time) and order_handle = #{orderHandle} - and order_repairman_code like - concat('%', #{orderRepairmanCode}, '%') - - and order_repairman_name like - concat('%', #{orderRepairmanName}, '%') - - and order_connection like concat('%', - #{orderConnection}, '%') - - and order_status = #{orderStatus} + and order_repairman_code like concat('%', #{orderRepairmanCode}, '%') + and order_repairman_name like concat('%', #{orderRepairmanName}, '%') + and order_connection like concat('%',#{orderConnection}, '%') and order_relevance = #{orderRelevance} and order_picture = #{orderPicture} and attr1 = #{attr1} @@ -118,9 +104,10 @@ and create_time = #{createTime} and create_by = #{createBy} and factory_code = #{factoryCode} - and repair_destination = - #{repairDestination} - + and repair_destination =#{repairDestination} + + and (order_status = '2' or order_status = '1') + and order_status = #{orderStatus} and del_flag = '0' ORDER BY create_time DESC @@ -148,6 +135,7 @@ ero.update_time, ero.factory_code, ero.repair_destination, + ero.audit_opinion, be.equipment_name, be.equipment_type_name, be.equipment_spec, @@ -197,6 +185,7 @@ update_time, factory_code, repair_destination, + audit_opinion, #{orderId}, @@ -223,6 +212,7 @@ #{updateTime}, #{factoryCode}, #{repairDestination}, + #{auditOpinion}, @@ -252,6 +242,7 @@ update_time = #{updateTime}, factory_code = #{factoryCode}, repair_destination = #{repairDestination}, + audit_opinion = #{auditOpinion}, where order_id = #{orderId} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index 961bc09ea..f6aa9af89 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -47,7 +47,8 @@ - + + @@ -92,7 +93,7 @@ - select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect,work_person_name from equ_repair_work_order + select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect,work_person_name,remark,audit_opinion from equ_repair_work_order + + insert into base_equipment From 226c4ca215f961e794c54bd64bfed9e02358127e Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 13 Aug 2024 13:53:47 +0800 Subject: [PATCH 08/13] =?UTF-8?q?2024-08-13=20WMS-=E8=AE=BE=E5=A4=87-?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AE=BE=E5=A4=87=E6=98=BE=E7=A4=BA=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/resources/mapper/wms/BaseEquipmentMapper.xml | 2 ++ 1 file changed, 2 insertions(+) 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 2c38add5b..929887afa 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 @@ -630,6 +630,8 @@ from equ_bind_auxiliary_equipment ebac left join base_equipment be on ebac.auxiliary_equipment_code = be.equipment_code where ebac.equipment_code = #{equipmentCode} + and ebac.del_flag = '0' + and be.del_flag = '0' order by ebac.auxiliary_equipment_code asc From 297e733e4108a67e2dd4fcb5c11a38b5ce0fd3bd Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 13 Aug 2024 16:15:11 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=8A=BD=E6=A0=B7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcCheckTaskIncomeServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 ed4b25643..9dacb676a 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 @@ -850,15 +850,13 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数 qcCheckTask.setCheckManCode(qcCheckTaskIncome.getUpdateBy()); qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); - qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); qcCheckTask.setReason(qcCheckTaskIncome.getReason()); qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注 - /**qc_check_task**/ - n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); - logger.info("qc_check_task:"+n); - /**更新qc_check_task_detail**/ + + BigDecimal sampleQuality = new BigDecimal("0"); for(QcCheckTaskDetail detail:details){ detail.setUpdateTime(nowTime); + sampleQuality = noOkQquality.add(new BigDecimal(detail.getSampleQuality())); //上传附件 if (StringUtils.isNotEmpty(detail.getFileListStr())) { String[] ids = detail.getFileListStr().split(","); @@ -880,6 +878,12 @@ public class QcCheckTaskIncomeServiceImpl implements } } + qcCheckTask.setSampleQuality(sampleQuality); + /**qc_check_task**/ + n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); + logger.info("qc_check_task:"+n); + /**更新qc_check_task_detail**/ + n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details); logger.info("更新qc_check_task_detail:"+n); From 7e7221183a7d7dcc7810c895e2d5a8450774a415 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 13 Aug 2024 21:14:22 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/mapper/QcInterfaceMapper.java | 2 + .../service/impl/QcInterfaceServiceImpl.java | 323 +++++++++--------- .../mapper/quality/QcInterfaceMapper.xml | 40 ++- 3 files changed, 190 insertions(+), 175 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java index 72d13e7b1..a125d650c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java @@ -49,4 +49,6 @@ public interface QcInterfaceMapper { @MapKey("nameDate") Map getLineChartsDatas(QcInterface qcInterface); + + QcInterface getProduceHz1(QcInterface qcInterface); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index 76ff9cd16..067582781 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -82,32 +82,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { String nowYMD = DateUtils.getDate(); qcInterface.setYmd(nowYMD); - //生产打开List dtos = qcInterfaceMapper.getCheckProjectsPie(qcInterface); - /**质量看板测试开始**/ - List dtos = new ArrayList<>(); - QcInterface q0 = new QcInterface(); - q0.setProjectName("热贮稳定性"); - q0.setQuality("1"); - dtos.add(q0); - QcInterface q1 = new QcInterface(); - q1.setProjectName("[香坯包膜]15mm＜爆口直径"); - q1.setQuality("2"); - dtos.add(q1); - QcInterface q2 = new QcInterface(); - q2.setProjectName("其它不良现象"); - q2.setQuality("5"); - dtos.add(q2); - QcInterface q3 = new QcInterface(); - q3.setProjectName("眼头插孔"); - q3.setQuality("1"); - dtos.add(q3); - QcInterface q4 = new QcInterface(); - q4.setProjectName("厚度（一盘）"); - q4.setQuality("2"); - dtos.add(q4); - - - /**质量看板测试结束**/ + List dtos = qcInterfaceMapper.getCheckProjectsPie(qcInterface); return dtos; } @@ -163,68 +138,68 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { dto.setCheckStatus("0".equals(dto.getCheckStatus()) ? "待检测" : "检测完成"); dto.setCheckResult("Y".equals(dto.getCheckResult()) ? "合格" : "不合格"); } - /**质量看板测试开始**/ - QcInterface q0 = new QcInterface(); - q0.setCheckNo("20240305001"); - q0.setIncomeBatchNo("20270122LJ20240123BBBA0G"); - q0.setOrderNo("000800000083-1"); - q0.setMaterialName("10小时无烟型黑蚊香(繁体)纸盒"); - q0.setQuality("19000"); - q0.setUnit("个"); - q0.setSupplierName("中山市粤华包装有限公司"); - q0.setIncomeTime("2024-03-05 00:00:00"); - q0.setCheckTime("2024-03-05 11:32:00"); - q0.setCheckResult("合格"); - q0.setCheckManName("马娥章"); - q0.setCheckName("来料检验"); - dtos.add(q0); - - QcInterface q1 = new QcInterface(); - q1.setCheckNo("20240306002"); - q1.setIncomeBatchNo("20270122LJ20240123BCCA0F"); - q1.setOrderNo("0008000001093-1"); - q1.setMaterialName("依素猫狗(黄色)气雾盖"); - q1.setQuality("5000"); - q1.setUnit("个"); - q1.setSupplierName("广州盛盈环保科技有限公司"); - q1.setIncomeTime("2024-03-05 00:00:00"); - q1.setCheckTime("2024-03-05 13:32:00"); - q1.setCheckResult("合格"); - q1.setCheckManName("马娥章"); - q1.setCheckName("来料检验"); - dtos.add(q1); - - QcInterface q2 = new QcInterface(); - q2.setCheckNo("20240307002"); - q2.setIncomeBatchNo("20270122LJ20240456BCCA0D"); - q2.setOrderNo("0008000001193-1"); - q2.setMaterialName("King Brand蚊片(450装)纸箱"); - q2.setQuality("5800"); - q2.setUnit("个"); - q2.setSupplierName("广州市网能产品设计有限公司"); - q2.setIncomeTime("2024-08-06 00:00:00"); - q2.setCheckTime("2024-08-06 13:42:00"); - q2.setCheckResult("合格"); - q2.setCheckManName("马娥章"); - q2.setCheckName("来料检验"); - dtos.add(q2); - - QcInterface q3 = new QcInterface(); - q3.setCheckNo("20240308001"); - q3.setIncomeBatchNo("20270122LJ20240456BCBB0D"); - q3.setOrderNo("0008000001203-1"); - q3.setMaterialName("榄菊牌清香型蚊液(空白)纸箱"); - q3.setQuality("7800"); - q3.setUnit("个"); - q3.setSupplierName("广州市网能产品设计有限公司"); - q3.setCheckTime("2024-03-05 13:50:00"); - q3.setIncomeTime("2024-08-06 00:00:00"); - q3.setCheckResult("合格"); - q3.setCheckManName("马娥章"); - q3.setCheckName("来料检验"); - dtos.add(q3); - - /**质量看板测试结束**/ +// /**质量看板测试开始**/ +// QcInterface q0 = new QcInterface(); +// q0.setCheckNo("20240305001"); +// q0.setIncomeBatchNo("20270122LJ20240123BBBA0G"); +// q0.setOrderNo("000800000083-1"); +// q0.setMaterialName("10小时无烟型黑蚊香(繁体)纸盒"); +// q0.setQuality("19000"); +// q0.setUnit("个"); +// q0.setSupplierName("中山市粤华包装有限公司"); +// q0.setIncomeTime("2024-03-05 00:00:00"); +// q0.setCheckTime("2024-03-05 11:32:00"); +// q0.setCheckResult("合格"); +// q0.setCheckManName("马娥章"); +// q0.setCheckName("来料检验"); +// dtos.add(q0); +// +// QcInterface q1 = new QcInterface(); +// q1.setCheckNo("20240306002"); +// q1.setIncomeBatchNo("20270122LJ20240123BCCA0F"); +// q1.setOrderNo("0008000001093-1"); +// q1.setMaterialName("依素猫狗(黄色)气雾盖"); +// q1.setQuality("5000"); +// q1.setUnit("个"); +// q1.setSupplierName("广州盛盈环保科技有限公司"); +// q1.setIncomeTime("2024-03-05 00:00:00"); +// q1.setCheckTime("2024-03-05 13:32:00"); +// q1.setCheckResult("合格"); +// q1.setCheckManName("马娥章"); +// q1.setCheckName("来料检验"); +// dtos.add(q1); +// +// QcInterface q2 = new QcInterface(); +// q2.setCheckNo("20240307002"); +// q2.setIncomeBatchNo("20270122LJ20240456BCCA0D"); +// q2.setOrderNo("0008000001193-1"); +// q2.setMaterialName("King Brand蚊片(450装)纸箱"); +// q2.setQuality("5800"); +// q2.setUnit("个"); +// q2.setSupplierName("广州市网能产品设计有限公司"); +// q2.setIncomeTime("2024-08-06 00:00:00"); +// q2.setCheckTime("2024-08-06 13:42:00"); +// q2.setCheckResult("合格"); +// q2.setCheckManName("马娥章"); +// q2.setCheckName("来料检验"); +// dtos.add(q2); +// +// QcInterface q3 = new QcInterface(); +// q3.setCheckNo("20240308001"); +// q3.setIncomeBatchNo("20270122LJ20240456BCBB0D"); +// q3.setOrderNo("0008000001203-1"); +// q3.setMaterialName("榄菊牌清香型蚊液(空白)纸箱"); +// q3.setQuality("7800"); +// q3.setUnit("个"); +// q3.setSupplierName("广州市网能产品设计有限公司"); +// q3.setCheckTime("2024-03-05 13:50:00"); +// q3.setIncomeTime("2024-08-06 00:00:00"); +// q3.setCheckResult("合格"); +// q3.setCheckManName("马娥章"); +// q3.setCheckName("来料检验"); +// dtos.add(q3); +// +// /**质量看板测试结束**/ return dtos; } @@ -236,40 +211,50 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { Map dtoMap = new HashMap<>(); qcInterface.setYmdType("dd"); - QcInterface hz = qcInterfaceMapper.getProduceHz(qcInterface); - if (hz != null) { - dtoMap.put("todayPro", hz.getQuality()); - dtoMap.put("todaySample", hz.getSampleQuality()); - dtoMap.put("todayNoOk", hz.getNoOkQuality()); - BigDecimal tOkRate = (new BigDecimal(hz.getSampleQuality()) - .subtract(new BigDecimal(hz.getNoOkQuality())) + QcInterface hz0 = qcInterfaceMapper.getProduceHz1(qcInterface); + if (hz0 != null) { + dtoMap.put("todayPro", hz0.getQuality().replaceAll("\\..*", "")); + }else{ + dtoMap.put("todayPro", "0"); + } + QcInterface hz1 = qcInterfaceMapper.getProduceHz(qcInterface); + if (hz1 != null) { + dtoMap.put("todaySample", hz1.getSampleQuality().replaceAll("\\..*", "")); + dtoMap.put("todayNoOk", hz1.getNoOkQuality().replaceAll("\\..*", "")); + BigDecimal tOkRate = (new BigDecimal(hz1.getSampleQuality()) + .subtract(new BigDecimal(hz1.getNoOkQuality())) ) .multiply(new BigDecimal(100)) - .divide(new BigDecimal(hz.getQuality()), 2, RoundingMode.HALF_UP); + .divide(new BigDecimal(hz1.getSampleQuality()), 2, RoundingMode.HALF_UP); dtoMap.put("todayOkRate", tOkRate + "%"); } qcInterface.setYmdType("mm"); + QcInterface hz20 = qcInterfaceMapper.getProduceHz1(qcInterface); + if (hz20 != null) { + dtoMap.put("monthPro", hz20.getQuality().replaceAll("\\..*", "")); + }else{ + dtoMap.put("monthPro", "0"); + } QcInterface hz2 = qcInterfaceMapper.getProduceHz(qcInterface); if (hz2 != null) { - dtoMap.put("monthPro", hz2.getQuality()); - dtoMap.put("monthNoOk", hz2.getNoOkQuality()); + dtoMap.put("monthNoOk", hz2.getNoOkQuality().replaceAll("\\..*", "")); BigDecimal tOkRate2 = (new BigDecimal(hz2.getSampleQuality()) .subtract(new BigDecimal(hz2.getNoOkQuality())) ) .multiply(new BigDecimal(100)) - .divide(new BigDecimal(hz2.getQuality()), 2, RoundingMode.HALF_UP); + .divide(new BigDecimal(hz2.getSampleQuality()), 2, RoundingMode.HALF_UP); dtoMap.put("monthOkRate", tOkRate2 + "%"); } - /**质量看板测试开始**/ - dtoMap.put("todayPro", "3800"); - dtoMap.put("todaySample", "50"); - dtoMap.put("todayNoOk", "2"); - dtoMap.put("todayOkRate", "96.00%"); - dtoMap.put("monthPro", "83600"); - dtoMap.put("monthNoOk", "30"); - dtoMap.put("monthOkRate", "99.96%"); - /**质量看板测试结束**/ +// /**质量看板测试开始**/ +// dtoMap.put("todayPro", "3800"); +// dtoMap.put("todaySample", "50"); +// dtoMap.put("todayNoOk", "2"); +// dtoMap.put("todayOkRate", "96.00%"); +// dtoMap.put("monthPro", "83600"); +// dtoMap.put("monthNoOk", "30"); +// dtoMap.put("monthOkRate", "99.96%"); +// /**质量看板测试结束**/ return dtoMap; } @@ -298,7 +283,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { List monthData = new ArrayList<>(); for (int mh = 1; mh <= nowMonth; mh++) { - String yyyymm = nowYMDs[1] + "-" + String.format("%02d", mh); + String yyyymm = nowYMDs[0] + "-" + String.format("%02d", mh); monthNames.add(yyyymm); if (!CollectionUtils.isEmpty(noOkHzs)&&noOkHzs.get(yyyymm)!=null) { monthData.add(noOkHzs.get(yyyymm).getNoOkQuality()); @@ -309,18 +294,18 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { dtoMap.put("month", monthNames); dtoMap.put("monthData", monthData); - /**质量看板测试开始**/ - List monthNames0 = new ArrayList<>(); - monthNames0.add("2024-01");monthNames0.add("2024-02");monthNames0.add("2024-03");monthNames0.add("2024-04"); - monthNames0.add("2024-05");monthNames0.add("2024-06");monthNames0.add("2024-07");monthNames0.add("2024-08"); - monthNames0.add("2024-09");monthNames0.add("2024-10");monthNames0.add("2024-11");monthNames0.add("2024-12"); - List monthData0 = new ArrayList<>(); - monthData0.add("5");monthData0.add("4");monthData0.add("7");monthData0.add("10");monthData0.add("5"); - monthData0.add("4");monthData0.add("9");monthData0.add("12");monthData0.add("3");monthData0.add("7"); - monthData0.add("5");monthData0.add("2"); - dtoMap.put("month", monthNames0); - dtoMap.put("monthData", monthData0); - /**质量看板测试结束**/ +// /**质量看板测试开始**/ +// List monthNames0 = new ArrayList<>(); +// monthNames0.add("2024-01");monthNames0.add("2024-02");monthNames0.add("2024-03");monthNames0.add("2024-04"); +// monthNames0.add("2024-05");monthNames0.add("2024-06");monthNames0.add("2024-07");monthNames0.add("2024-08"); +// monthNames0.add("2024-09");monthNames0.add("2024-10");monthNames0.add("2024-11");monthNames0.add("2024-12"); +// List monthData0 = new ArrayList<>(); +// monthData0.add("5");monthData0.add("4");monthData0.add("7");monthData0.add("10");monthData0.add("5"); +// monthData0.add("4");monthData0.add("9");monthData0.add("12");monthData0.add("3");monthData0.add("7"); +// monthData0.add("5");monthData0.add("2"); +// dtoMap.put("month", monthNames0); +// dtoMap.put("monthData", monthData0); +// /**质量看板测试结束**/ return dtoMap; } @@ -392,58 +377,58 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { } lastYM.setDayStr(daystr0); nowYM.setDayStr(daystr1); -//生产打开 -// qcInterface.setYmd("'" + nowYear + "','" + lastYear + "'"); -// -// Map noOkNum = qcInterfaceMapper.getMothNoOkNum(qcInterface); -// if (noOkNum == null) { -// return null; -// } -// -// List dataBar0 = new ArrayList<>();//不合规数量 -// List dataLine0 = new ArrayList<>();//不合格率 -// for (String day0 : daystr0) { -// QcInterface last = noOkNum.get(day0); -// if (last != null) { -// dataBar0.add(last.getNoOkQuality()); -// BigDecimal norate0 = new BigDecimal(last.getNoOkQuality()).multiply(new BigDecimal(100)) -// .divide(new BigDecimal(last.getQuality()), 2, RoundingMode.HALF_UP); -// dataLine0.add(norate0.toString()); -// } else { -// dataBar0.add("0"); -// dataLine0.add("0.00"); -// } -// } -// -// List dataBar1 = new ArrayList<>();//不合规数量 -// List dataLine1 = new ArrayList<>();//不合格率 -// for (String day1 : daystr1) { -// QcInterface now = noOkNum.get(day1); -// if (now != null) { -// dataBar1.add(now.getNoOkQuality()); -// BigDecimal norate0 = new BigDecimal(now.getNoOkQuality()).multiply(new BigDecimal(100)) -// .divide(new BigDecimal(now.getQuality()), 2, RoundingMode.HALF_UP); -// dataLine1.add(norate0.toString()); -// } else { -// dataBar1.add("0"); -// dataLine1.add("0.00"); -// } -// } - /**质量看板测试开始**/ + //生产打开 + qcInterface.setYmd("'" + nowYear + "','" + lastYear + "'"); + + Map noOkNum = qcInterfaceMapper.getMothNoOkNum(qcInterface); + if (noOkNum == null) { + return null; + } + List dataBar0 = new ArrayList<>();//不合规数量 List dataLine0 = new ArrayList<>();//不合格率 + for (String day0 : daystr0) { + QcInterface last = noOkNum.get(day0); + if (last != null) { + dataBar0.add(last.getNoOkQuality()); + BigDecimal norate0 = new BigDecimal(last.getNoOkQuality()).multiply(new BigDecimal(100)) + .divide(new BigDecimal(last.getQuality()), 2, RoundingMode.HALF_UP); + dataLine0.add(norate0.toString()); + } else { + dataBar0.add("0"); + dataLine0.add("0.00"); + } + } + List dataBar1 = new ArrayList<>();//不合规数量 List dataLine1 = new ArrayList<>();//不合格率 - dataBar0.add("4");dataBar0.add("9");dataBar0.add("7");dataBar0.add("13");dataBar0.add("11");dataBar0.add("7"); - dataBar0.add("8");dataBar0.add("4");dataBar0.add("5");dataBar0.add("2");dataBar0.add("10");dataBar0.add("6"); - dataBar1.add("3");dataBar1.add("14");dataBar1.add("17");dataBar1.add("3");dataBar1.add("9");dataBar1.add("3"); - dataBar1.add("8");dataBar1.add("5");dataBar1.add("4");dataBar1.add("2");dataBar1.add("9");dataBar1.add("5"); - - dataLine0.add("1");dataLine0.add("2");dataLine0.add("0.5");dataLine0.add("0.9");dataLine0.add("1");dataLine0.add("1.9"); - dataLine0.add("1.1");dataLine0.add("1");dataLine0.add("0.7");dataLine0.add("0.9");dataLine0.add("1.5");dataLine0.add("1.3"); - dataLine1.add("0.5");dataLine1.add("1.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("0.7");dataLine1.add("1.9"); - dataLine1.add("1.4");dataLine1.add("0.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("1.3");dataLine1.add("1.2"); - /**质量看板测试结束**/ + for (String day1 : daystr1) { + QcInterface now = noOkNum.get(day1); + if (now != null) { + dataBar1.add(now.getNoOkQuality()); + BigDecimal norate0 = new BigDecimal(now.getNoOkQuality()).multiply(new BigDecimal(100)) + .divide(new BigDecimal(now.getQuality()), 2, RoundingMode.HALF_UP); + dataLine1.add(norate0.toString()); + } else { + dataBar1.add("0"); + dataLine1.add("0.00"); + } + } +// /**质量看板测试开始**/ +// List dataBar0 = new ArrayList<>();//不合规数量 +// List dataLine0 = new ArrayList<>();//不合格率 +// List dataBar1 = new ArrayList<>();//不合规数量 +// List dataLine1 = new ArrayList<>();//不合格率 +// dataBar0.add("4");dataBar0.add("9");dataBar0.add("7");dataBar0.add("13");dataBar0.add("11");dataBar0.add("7"); +// dataBar0.add("8");dataBar0.add("4");dataBar0.add("5");dataBar0.add("2");dataBar0.add("10");dataBar0.add("6"); +// dataBar1.add("3");dataBar1.add("14");dataBar1.add("17");dataBar1.add("3");dataBar1.add("9");dataBar1.add("3"); +// dataBar1.add("8");dataBar1.add("5");dataBar1.add("4");dataBar1.add("2");dataBar1.add("9");dataBar1.add("5"); +// +// dataLine0.add("1");dataLine0.add("2");dataLine0.add("0.5");dataLine0.add("0.9");dataLine0.add("1");dataLine0.add("1.9"); +// dataLine0.add("1.1");dataLine0.add("1");dataLine0.add("0.7");dataLine0.add("0.9");dataLine0.add("1.5");dataLine0.add("1.3"); +// dataLine1.add("0.5");dataLine1.add("1.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("0.7");dataLine1.add("1.9"); +// dataLine1.add("1.4");dataLine1.add("0.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("1.3");dataLine1.add("1.2"); +// /**质量看板测试结束**/ lastYM.setDataBarArrays(dataBar0); lastYM.setDataLineArrays(dataLine0); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml index 5cba2becd..0f3340246 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml @@ -40,6 +40,7 @@ + From 0e8e1dd287c110d38f1ab86cb8ebf8ad6a6df926 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 14 Aug 2024 17:59:38 +0800 Subject: [PATCH 11/13] =?UTF-8?q?2024-08-14=20=E8=AE=BE=E5=A4=87-=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BC=98=E5=8C=96+=E5=A7=94=E5=A4=96=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96+=E7=94=9F=E6=88=90=E5=A7=94?= =?UTF-8?q?=E5=A4=96=E5=8D=95=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquRepairWorkOrderController.java | 2 +- .../controller/EquUpkeepOrderController.java | 2 +- .../service/impl/DeviceTaskServiceImpl.java | 6 +- .../impl/EquOutsourceWorkServiceImpl.java | 143 +++++++++++++----- .../impl/EquRepairOrderServiceImpl.java | 2 + 5 files changed, 113 insertions(+), 42 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java index 4505c5b6d..2bb5f525a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java @@ -146,7 +146,7 @@ public class EquRepairWorkOrderController extends BaseController { * @param upKeepOrderDTO * @return */ - @RequiresPermissions("device:repairOrder:checkRepairWorkOrder") + @RequiresPermissions("device:repairOrder:check") @PostMapping("/checkRepairWorkOrder") public AjaxResult checkRepairWorkOrder(@RequestBody UpKeepOrderDTO upKeepOrderDTO) { return equRepairWorkOrderService.checkRepairWorkOrder(upKeepOrderDTO); diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepOrderController.java index 662812e86..927c3b2dc 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepOrderController.java @@ -37,7 +37,7 @@ public class EquUpkeepOrderController extends BaseController { * @param upKeepOrderDTO * @return */ - @RequiresPermissions("device:upkeepOrder:subInspect") + @RequiresPermissions("device:upkeepOrder:check") @PostMapping("/subInspect") public AjaxResult subInspect(@RequestBody UpKeepOrderDTO upKeepOrderDTO) { return equUpkeepOrderService.subInspect(upKeepOrderDTO); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index eb415717b..27d3c4295 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -149,7 +149,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { } /** - * 根据保养计划生成点检任务 + * 根据保养计划生成保养任务 **/ @Override public AjaxResult createMaintenancePlanTask() { @@ -336,9 +336,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { String serialNum = String.format("%03d", equOrderMapper.selectSerialNumber()); String orderCode = "O" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum; order.setOrderCode(orderCode); - + //todo 工厂号 if ("1".equals(plan.getUpkeep())) {//1委外工单 - order.setOutsourceCode("BW" + orderCode); + order.setOutsourceCode("WW" + orderCode); } if(StringUtils.isNotEmpty(plan.getEquipmentCode())){ diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java index aa60e15fa..c08eed911 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java @@ -9,12 +9,9 @@ import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.Equipment; -import com.op.device.mapper.EquOrderMapper; -import com.op.device.mapper.EquRepairWorkOrderMapper; -import com.op.device.mapper.EquipmentMapper; +import com.op.device.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.op.device.mapper.EquOutsourceWorkMapper; import com.op.device.domain.EquOutsourceWork; import com.op.device.service.IEquOutsourceWorkService; import org.springframework.web.context.request.RequestContextHolder; @@ -42,7 +39,6 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Autowired private EquipmentMapper equipmentMapper; - /** * 查询委外工单 * @@ -90,28 +86,85 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { String key = "#header.poolName"; equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); - ////修改工单状态、设备状态 - if (equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("0")) { - //更新维修工单状态 - equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode()); + //todo 委外也需要审核 + //todo 故障 + ////修改设备状态 + EquEquipment example = new EquEquipment(); + example.setEquipmentCode(equOutsourceWork.getEquipmentCode()); + Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOutsourceWork.getEquipmentCode()); + + //如果未完成工单 + if(equOutsourceWork.getWorkStatus().equals("0")){ + //如果是委外维修 + if (equOutsourceWork.getWorkType().equals("0")) { + //1.修改设备状态 正常运行1--->故障0 + if (equipment.getEquipmentStatus().equals("1")) { + example.setEquipmentStatus("0"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); + + //2.修改设备状态 保养中3---->维修保养中4 + }else if (equipment.getEquipmentStatus().equals("3")) { + example.setEquipmentStatus("4"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); + } + //原来是故障0/维修中2/维修保养中4 什么都不改变 + + //如果是委外保养 + } else if (equOutsourceWork.getWorkType().equals("1")) { + //1.修改设备状态维修中2----->维修保养中4 + if (equipment.getEquipmentStatus().equals("2")) { + example.setEquipmentStatus("4"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); + + //2.正常1--->保养中 + }else if (equipment.getEquipmentStatus().equals("1")) { + example.setEquipmentStatus("3"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); + + //3.故障0 和 维修---->维修保养中4 + }else if (equipment.getEquipmentStatus().equals("0")) { + example.setEquipmentStatus("4"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); + } + //维修保养中不变 保养中不变 + } + } + + //如果完成工单 + if (equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("0")) { + //1.如果是完成委外 查看是否存在维修单 存在的话改维修单状态 改设备状态 WorkType 0 维修委外 + //1.1 更新维修工单状态 + equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode()); + //todo 按照正常来说应该加一个审核再 修改设备状态 改为正常运行 + + //1.2 更新设备状态 + //设备状态 故障0/维修中2--->正常运行1 + if(equipment.getEquipmentStatus().equals("0") || equipment.getEquipmentStatus().equals("2")){ + example.setEquipmentStatus("1"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); + + //设备状态 维修保养中4--->保养中3 + }else if(equipment.getEquipmentStatus().equals("4")){ + example.setEquipmentStatus("3"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); + } - //修改设备状态 改为正常运行 - EquEquipment equEquipment = new EquEquipment(); - equEquipment.setEquipmentCode(equOutsourceWork.getEquipmentCode()); - equEquipment.setEquipmentStatus("1"); - equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); } else if (equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("1")) { + //2.如果是完成委外 查看是否存在保养 存在的话改保养单状态 改设备状态 WorkType 1 保养委外 //更新保养工单状态 equOrderMapper.updateEquOrderStatusComplete(equOutsourceWork.getRepairCode()); + //todo 按照正常来说应该加一个审核再 修改设备状态 改为正常运行 - //修改设备状态 改为正常运行 - //查找当前运行的设备信息 如果是维修中则不改 维修>保养 - EquEquipment example = new EquEquipment(); - example.setEquipmentCode(equOutsourceWork.getEquipmentCode()); - Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOutsourceWork.getEquipmentCode()); - if (equipment.getEquipmentStatus().equals("3")) { + //2.2 更新设备状态 + //设备状态 保养中3--->正常运行1 + if(equipment.getEquipmentStatus().equals("3")){ example.setEquipmentStatus("1"); equRepairWorkOrderMapper.updateEquipmentStatus(example); + + //设备状态 维修保养中4--->维修中2 + }else if(equipment.getEquipmentStatus().equals("4")){ + example.setEquipmentStatus("2"); + equRepairWorkOrderMapper.updateEquipmentStatus(example); } } @@ -127,28 +180,44 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Override @DS("#header.poolName") public int updateEquOutsourceWork(EquOutsourceWork equOutsourceWork) { - //1完成委外，更新工单状态 - if (equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("0")) { - //更新维修工单状态 - equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode()); + EquEquipment equEquipment = new EquEquipment(); + equEquipment.setEquipmentCode(equOutsourceWork.getEquipmentCode()); + Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOutsourceWork.getEquipmentCode()); + + if (equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("0")) { + //1.如果是完成委外 查看是否存在维修单 存在的话改维修单状态 改设备状态 WorkType 0 维修委外 + //1.1 更新维修工单状态 + equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode()); + //todo 按照正常来说应该加一个审核再 修改设备状态 改为正常运行 + + //1.2 更新设备状态 + //设备状态 故障0/维修中2--->正常运行1 + if(equipment.getEquipmentStatus().equals("0") || equipment.getEquipmentStatus().equals("2")){ + equEquipment.setEquipmentStatus("1"); + equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); + + //设备状态 维修保养中4--->保养中3 + }else if(equipment.getEquipmentStatus().equals("4")){ + equEquipment.setEquipmentStatus("3"); + equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); + } - //修改设备状态 改为正常运行 - EquEquipment equEquipment = new EquEquipment(); - equEquipment.setEquipmentCode(equOutsourceWork.getEquipmentCode()); - equEquipment.setEquipmentStatus("1"); - equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); } else if (equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("1")) { + //2.如果是完成委外 查看是否存在保养 存在的话改保养单状态 改设备状态 WorkType 1 保养委外 //更新保养工单状态 equOrderMapper.updateEquOrderStatusComplete(equOutsourceWork.getRepairCode()); + //todo 按照正常来说应该加一个审核再 修改设备状态 改为正常运行 - //修改设备状态 改为正常运行 - //查找当前运行的设备信息 如果是维修中则不改 维修>保养 - EquEquipment example = new EquEquipment(); - example.setEquipmentCode(equOutsourceWork.getEquipmentCode()); - Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOutsourceWork.getEquipmentCode()); - if (equipment.getEquipmentStatus().equals("3")) { - example.setEquipmentStatus("1"); - equRepairWorkOrderMapper.updateEquipmentStatus(example); + //2.2 更新设备状态 + //设备状态 保养中3--->正常运行1 + if(equipment.getEquipmentStatus().equals("3")){ + equEquipment.setEquipmentStatus("1"); + equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); + + //设备状态 维修保养中4--->维修中2 + }else if(equipment.getEquipmentStatus().equals("4")){ + equEquipment.setEquipmentStatus("2"); + equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index 52d2c2864..3bed1b98b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -320,9 +320,11 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { equOutsourceWork.setWorkType("0"); //委外类型 维修委外 equOutsourceWork.setCreateBy(SecurityUtils.getUsername()); equOutsourceWork.setCreateTime(DateUtils.getNowDate()); + equOutsourceWork.setDelFlag("0"); //删除标识 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); + ////更新委外列表 equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); From dcf87b4e7f53cbabb9a080fd15acff08b23da3bc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 14 Aug 2024 18:00:50 +0800 Subject: [PATCH 12/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcCheckTaskIncomeServiceImpl.java | 11 +++++++---- .../quality/service/impl/QcProCheckServiceImpl.java | 2 ++ .../service/impl/QcStaticTableServiceImpl.java | 8 ++++---- .../resources/mapper/quality/QcStaticTableMapper.xml | 9 ++++++++- 4 files changed, 21 insertions(+), 9 deletions(-) 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 9dacb676a..107427c71 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 @@ -856,7 +856,7 @@ public class QcCheckTaskIncomeServiceImpl implements BigDecimal sampleQuality = new BigDecimal("0"); for(QcCheckTaskDetail detail:details){ detail.setUpdateTime(nowTime); - sampleQuality = noOkQquality.add(new BigDecimal(detail.getSampleQuality())); + sampleQuality = noOkQquality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality())); //上传附件 if (StringUtils.isNotEmpty(detail.getFileListStr())) { String[] ids = detail.getFileListStr().split(","); @@ -985,7 +985,7 @@ public class QcCheckTaskIncomeServiceImpl implements if("produce".equals(qcCheckTaskIncome.getTypeCode())||"product".equals(qcCheckTaskIncome.getTypeCode())){ unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode()); unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); - unqualified.setUser(qcCheckTaskIncome.getPgzg());//qcCheckTaskIncome.getUpdateBy(); + //申请人- unqualified.setSqr("MSL#"+qcCheckTaskIncome.getSqr()); //申请部门 @@ -1001,9 +1001,12 @@ public class QcCheckTaskIncomeServiceImpl implements if(qcCheckTaskIncome.getSfxyzg().equals("0")){//是 //qc主管 unqualified.setPgzg("MSL#"+qcCheckTaskIncome.getPgzg()); - //质量主管 - unqualified.setPgzr("MSL#"+qcCheckTaskIncome.getPgzr()); + unqualified.setUser(qcCheckTaskIncome.getPgzg()); + }else{ + unqualified.setUser(qcCheckTaskIncome.getPgzr()); } + //质量主管 + unqualified.setPgzr("MSL#"+qcCheckTaskIncome.getPgzr()); //是否供应商问题 unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); unqualified.setOaFactoryF(qcCheckTaskIncome.getOaFactoryF()); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index 9fbffd847..b44dc61b1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -185,6 +185,8 @@ public class QcProCheckServiceImpl implements QcProCheckService { Map defectMap = qcCheckTaskDefectMapper.getDefectMap(qcCheckTaskDetail); for (QcCheckTaskDetail qcd : qcCheckTaskDetails) { + qcd.setSampleQuality(qcd.getSampleQuality().replaceAll("\\..*", ""));//去掉小数 + List files = qmsFileMapper.getBaseFileBatch(qcd.getRecordId()); if (CollectionUtils.isNotEmpty(files)) { qcd.setFiles(files); 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 f19bffb16..75131a865 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 @@ -112,10 +112,10 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { tabledto.setNoOkNumRate("0.00%"); } } - - return tabledtos.stream() - .filter(obj -> obj.getBatchs() != 0) - .collect(Collectors.toList()); + return tabledtos; +// return tabledtos.stream() +// .filter(obj -> obj.getBatchs() != 0) +// .collect(Collectors.toList()); } /** 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 eed072475..88166b58b 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 @@ -7,6 +7,7 @@ + +