From 538841b44f780506fcd18ba082ee34527015aa68 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 2 Feb 2024 10:55:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E4=B8=8D=E8=89=AF=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=80=BB=E8=BE=91+=E6=8A=A5=E5=B7=A5=E6=89=93=E5=8D=B0v.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 5 ++++ .../java/com/op/mes/domain/MesReportWork.java | 29 +++++++++++++++++++ .../op/mes/mapper/MesReportWorkMapper.java | 2 ++ .../op/mes/service/IMesReportWorkService.java | 2 ++ .../impl/MesReportWorkServiceImpl.java | 8 +++-- .../mapper/mes/MesReportWorkMapper.xml | 20 ++++++++++++- .../op/quality/controller/QuaController.java | 4 +-- .../com/op/quality/domain/QcDefectType.java | 9 ++++++ .../mapper/QcCheckUnqualifiedMapper.java | 2 ++ .../service/IQcCheckTaskIncomeService.java | 2 ++ .../impl/QcCheckTaskIncomeServiceImpl.java | 20 +++++++++---- .../impl/QcCheckTaskProduceServiceImpl.java | 13 +++++++++ .../QcCheckTaskWarehousingServiceImpl.java | 11 ++++++- .../quality/QcCheckUnqualifiedMapper.xml | 8 +++++ 14 files changed, 124 insertions(+), 11 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 32a2566e..539f3510 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -411,6 +411,11 @@ public class MesReportWorkController extends BaseController { return rlist; } + /**获取报工打印信息**/ + @PutMapping("/getPutInOrderList") + public AjaxResult getPutInOrderList(@RequestBody MesReportWork mesReportWorks) { + return success(mesReportWorkService.getPutInOrderList(mesReportWorks)); + } public static void main(String args[]){ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00"); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index bc45ed0d..cab779e9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -221,6 +221,35 @@ public class MesReportWork extends BaseEntity { private String workCenter; private String shiftId; private String keywords; + private String workshopName; + //凭证 + private String voucher; + //版本 + private String version; + + public String getVoucher() { + return voucher; + } + + public void setVoucher(String voucher) { + this.voucher = voucher; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWorkshopName() { + return workshopName; + } + + public void setWorkshopName(String workshopName) { + this.workshopName = workshopName; + } public String getKeywords() { return keywords; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 153d45bb..c703d11b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -129,4 +129,6 @@ public interface MesReportWorkMapper { List selectMesReportWorkList_S(MesReportWork mesReportWork); int reportSapCancel(MesReportWork mesReportWork); + + List getPutInOrderList(MesReportWork mesReportWorks); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java index 95d9f2cb..f2ae05f3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -103,4 +103,6 @@ public interface IMesReportWorkService { List selectMesReportWorkList_S(MesReportWork mesReportWork); int reportSapCancel(MesReportWork mesReportWork); + + List getPutInOrderList(MesReportWork mesReportWorks); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index d0cf34fc..645a4a90 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -184,6 +184,12 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { return m; } + @Override + @DS("#header.poolName") + public List getPutInOrderList(MesReportWork mesReportWorks) { + return mesReportWorkMapper.getPutInOrderList(mesReportWorks); + } + /** * 修改报工报表 * @@ -458,8 +464,6 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { return dtos; } - - public static void main(String[] args) { Calendar calendar = Calendar.getInstance(); Date now = calendar.getTime(); 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 b42d8677..16b9b6ee 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 @@ -640,8 +640,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY mrw.create_time DESC + - + insert into mes_report_work id, 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 572ff945..fefd949c 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 @@ -240,10 +240,10 @@ public class QuaController extends BaseController { } /**不良类型**/ - @PutMapping("/getDefectListPDA") + @PostMapping("/getDefectListPDA") public List getDefectListPDA(@RequestBody QcDefectType qcDefectType) { DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode()); - return qcCheckTaskIncomeService.getDefectList(qcDefectType); + return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType); } /**获取生产工单列表**/ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java index e2546318..1ac75b82 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java @@ -73,6 +73,15 @@ public class QcDefectType extends BaseEntity { // 创建日期结束 private String createTimeEnd; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } public List getCreateTimeArray() { return createTimeArray; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java index 8e0e0b29..1fb93f47 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java @@ -89,4 +89,6 @@ public interface QcCheckUnqualifiedMapper { int repeatCheckTaskDefect(QcCheckTaskIncome recheck); int repeatCheckTaskDetail(QcCheckTaskIncome recheck); int repeatCheckTaskUser(QcCheckTaskIncome recheck); + + List getDefectListPDA(QcDefectType qcDefectType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 48a1a7be..f30c09e5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -89,4 +89,6 @@ public interface IQcCheckTaskIncomeService { List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); List getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome); + + List getDefectListPDA(QcDefectType qcDefectType); } 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 9fe4772b..ad81540b 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 @@ -170,6 +170,15 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return 0;//没有找到检测项目 } + /**qc_sample_rule**/ + QcCheckTaskIncome sampQua = new QcCheckTaskIncome(); + sampQua.setCheckType(qcCheckTaskIncome.getCheckType()); + sampQua.setQuality(qcCheckTaskIncome.getQuality()); + String sampNum = qcSampleRuleMapper.getSampNum(sampQua); + if(StringUtils.isNotBlank(sampNum)){ + qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum)); + } + /**qc_check_task**/ String beLongId = IdUtils.fastSimpleUUID(); qcCheckTaskIncome.setRecordId(beLongId); @@ -238,11 +247,6 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } } qcCheckTaskIncome.setNoOkQuality(noOkQuality); - /**qc_sample_rule**/ - String sampNum = qcSampleRuleMapper.getSampNum(qcCheckTaskIncome); - if(StringUtils.isNotBlank(sampNum)){ - qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum)); - } /**qc_check_task**/ qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); @@ -478,6 +482,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return qcCheckUnqualifiedMapper.getDefectList(qcDefectType); } + @Override + @DS("#header.poolName") + public List getDefectListPDA(QcDefectType qcDefectType) { + return qcCheckUnqualifiedMapper.getDefectListPDA(qcDefectType); + } + @Override @DS("#header.poolName") public List getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index b4811f46..cb363579 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -79,6 +79,9 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService @Autowired private IQcCheckTaskDefectService qcCheckTaskDefectService; + @Autowired + private QcSampleRuleMapper qcSampleRuleMapper; + /** * 查询生产过程检验任务 * @@ -226,6 +229,16 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService } } qcCheckTaskProduce.setNoOkQuality(noOkQuality); + + /**qc_sample_rule**/ + QcCheckTaskIncome sampQua = new QcCheckTaskIncome(); + sampQua.setCheckType(qcCheckTaskProduce.getCheckType()); + sampQua.setQuality(qcCheckTaskProduce.getQuality()); + String sampNum = qcSampleRuleMapper.getSampNum(sampQua); + if(StringUtils.isNotBlank(sampNum)){ + qcCheckTaskProduce.setSampleQuality(new BigDecimal(sampNum)); + } + /**qc_check_task**/ qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index d1af1d7a..39756c02 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -56,6 +56,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; @Autowired private IQcCheckTaskDefectService qcCheckTaskDefectService; + @Autowired + private QcSampleRuleMapper qcSampleRuleMapper; /** * 查询成品入库检验任务 @@ -208,7 +210,14 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin } } qcCheckTaskWarehousing.setNoOkQuality(noOkQuality); - + /**qc_sample_rule**/ + QcCheckTaskIncome sampQua = new QcCheckTaskIncome(); + sampQua.setCheckType(qcCheckTaskWarehousing.getCheckType()); + sampQua.setQuality(qcCheckTaskWarehousing.getQuality()); + String sampNum = qcSampleRuleMapper.getSampNum(sampQua); + if(StringUtils.isNotBlank(sampNum)){ + qcCheckTaskWarehousing.setSampleQuality(new BigDecimal(sampNum)); + } /**qc_check_task**/ int n = qcCheckTaskWarehousingMapper.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing); logger.info("qc_check_task:"+n+"成功"); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index 4d6a4555..49984939 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -138,6 +138,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and wpp.work_order like concat like ('%',#{orderNo}) order by wpp.create_time desc + insert into qc_check_unqualified From 0df08e1953549cff8a62c1e7d957ad35c132c2a7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 2 Feb 2024 13:30:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=89=93=E5=8D=B0v.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 6 ++++-- .../op-plan/src/main/java/com/op/plan/domain/ProOrder.java | 2 +- .../java/com/op/sap/service/impl/SapOrderServiceImpl.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) 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 16b9b6ee..3baa8388 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 @@ -650,13 +650,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.quantity_feedback quantityFeedback, mrw.unit, pow.factory_code factoryCode, - equ.workshop_name workshopName + equ.workshop_name workshopName, + pow.attr2 version from mes_report_work mrw left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code left join base_equipment equ on equ.equipment_code = mrw.machine_code + left join pro_order po on po.order_code = pow.order_code where mrw.parent_order = '0' and mrw.workorder_code = #{workorderCode} - and mrw.del_flag = '0' + and mrw.del_flag = '0' and po.del_flag = '0' diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java index 3e6128ca..d9371de2 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java @@ -101,7 +101,7 @@ public class ProOrder extends TreeEntity { /** $column.columnComment */ private String atrr1; - /** $column.columnComment */ + /** 订单版本*/ private String atrr2; /** $column.columnComment */ 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 8fbf248b..675b2d44 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 @@ -120,7 +120,8 @@ public class SapOrderServiceImpl implements SapOrderService { String ERNAM = maraTable.getString("ERNAM"); String ERDAT = maraTable.getString("ERDAT"); String STTXT = maraTable.getString("STTXT"); - log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX + String VERID = maraTable.getString("VERID"); + log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + "-生产版本:"+ VERID +" -上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX + " - 订单的计划工厂：" + PWERK + " - 订单数量总计：" + GAMNG + " - 基本计量单位：" + GMEIN + " - 任务清单组码：" + PLNNR + " - 基本开始日期：" + GSTRP + " - 基本完成日期：" + GLTRP + " - 输入者：" + ERNAM + " - 创建日期：" + ERDAT + " - 系统状态：" + STTXT); // System.out.println("订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX @@ -131,6 +132,7 @@ public class SapOrderServiceImpl implements SapOrderService { proOrder.setPlanFactoryCode(PWERK); proOrder.setOrderCode(AUFNR); proOrder.setOrderType(AUART); + proOrder.setAtrr2(VERID); proOrder.setProdCode(PLNBEZ); proOrder.setProdDesc(MAKTX); proOrder.setQuantity(Long.parseLong(GAMNG.substring(0, GAMNG.indexOf("."))));