From 93d33895e7a67568cb5b998e7963eca7c8ea6258 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 8 Mar 2024 22:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=85=AC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9+=E8=AE=A2=E5=8D=95=E5=85=B3=E9=97=AD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9+=E5=B7=A1=E6=A3=80=E5=A4=9A?= =?UTF-8?q?=E5=87=BA=E4=B8=80=E6=9D=A1=E7=9A=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/mes/service/impl/IWCInterfaceServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 2 +- .../java/com/op/open/service/impl/OpenServiceImpl.java | 5 ++++- .../resources/mapper/quality/QcCheckTaskProduceMapper.xml | 3 ++- .../java/com/op/sap/service/impl/SapOrderServiceImpl.java | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index f7465042..349343ef 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -295,14 +295,14 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { * * 其它 = 人工 * * 二层---------------------------------------- * * 子单进行报工的时候公式调整如下（数值单位不用管）： - * * 机器=sum(工时数/用人数) + * * 机器=sum(工时数) * * 人工 = 用人数*机器 * * 折旧 = 机器 * * 其它 = 人工 * *

* * 母单进行报工的时候公式调整如下： - * * 机器=子单机器 - * * 人工 = 管理系统维护的用人数*机器 + * * 机器=sum(工时数) + * * 人工 = 4*sum(工时数) * * 折旧 = 机器 * * 其它 = 人工 * * 三层及其以上---------------------------------------- @@ -368,7 +368,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { //母工单报工 logger.info("==========================母工单报工开始"); pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); - pHzWork.setSac1(sHzWorks.getSac1()); + pHzWork.setSac2("4");//母单报工固定值 R sapR = this.reportHzToSap(pHzWork,2); logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR)); return sapR; 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 fd8f7a95..a4a21585 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 @@ -578,7 +578,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select workorder_code, sum(quantity_feedback) quantity_feedback, - sum(round( work_time/use_man,2)) sac1, + sum(work_time) sac1, use_man sac2, product_code, product_name diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 00aae8e0..85ad36a0 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -391,7 +391,10 @@ public class OpenServiceImpl implements OpenService { } /**qc_check_task**/ - + if("checkTypeSCXJ".equals(qcCheckTaskProduce.getCheckType())){ + //巡检要求8-20点准点产生巡检任务。要求8点之前开始生产，那么第一条上位机触发的就当成模板 + qcCheckTaskProduce.setDelFlag("1"); + } qcCheckTaskProduce.setRecordId(beLongId); qcCheckTaskProduce.setFactoryCode(factoryCode); qcCheckTaskProduce.setCreateTime(nowDate); 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 926f70b4..ff5c6770 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 @@ -179,7 +179,8 @@ qct.confirm_man_name confirmManName from qc_check_task qct left join pro_order_workorder pow on qct.order_no = pow.workorder_code - where check_type = 'checkTypeSCXJ' and qct.del_flag = '0' and pow.del_flag = '0' + where qct.check_type = 'checkTypeSCXJ' + and pow.del_flag = '0' and CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120) and pow.status = 'w2' and pow.parent_order = '0' group by qct.factory_code, diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 7be1d435..0c4d03a1 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -228,7 +228,7 @@ public class SapOrderServiceImpl implements SapOrderService { // JCoDestination dest = SAPConnUtils.connect(); log.info("订单关闭入参------"+sapCloseOrderQuery.toString()); JCoRepository repository = dest.getRepository(); - JCoFunction func = repository.getFunction("ZPPR_MES_PRODORD_CLOSE"); + JCoFunction func = repository.getFunction("ZMES_AUFNR_CLOSE"); if (func == null) { throw new RuntimeException("Function does not exist in SAP"); }