From 1911b6657d32774a3948c549e6664bc6c77e7edb Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 8 Apr 2024 15:03:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=89=E5=B1=82=E6=8A=A5=E5=B7=A5bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IWCInterfaceServiceImpl.java | 11 +++++++---- .../service/impl/MesReportWorkServiceImpl.java | 10 ++++++++-- .../mapper/mes/MesReportWorkMapper.xml | 8 +++++--- .../op/quality/domain/QcCheckTaskIncome.java | 18 ++++++++++++++++++ .../op/sap/service/impl/SapItemSyncImpl.java | 5 ++++- 5 files changed, 42 insertions(+), 10 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 d8813b383..a5ae95022 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 @@ -398,7 +398,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } }else if(workOrders.size()>=3){ - MesReportWork hzWorks = null; + BigDecimal gamng = null; for(int n=0;n pow.del_flag = '0' - and pow.order_code like concat('%', #{keywords}, '%') or - pow.workorder_code_sap like concat('%', #{keywords}, '%') or - mrw.productCode like concat('%', #{keywords}, '%') + and ( + pow.order_code like concat('%', #{keywords}, '%') or + pow.workorder_code_sap like concat('%', #{keywords}, '%') or + mrw.productCode like concat('%', #{keywords}, '%') + ) and pow.product_date >= #{feedbackTimeStart} and #{feedbackTimeEnd} >= pow.product_date diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index e0df6f82e..421cf69f7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -193,6 +193,24 @@ public class QcCheckTaskIncome extends BaseEntity { private String noOkQualityNames; private String noOkQualityVals; + private String materialType;//来料类别 + private String materialFrom;//物料来源 + public String getMaterialType() { + return materialType; + } + + public void setMaterialType(String materialType) { + this.materialType = materialType; + } + + public String getMaterialFrom() { + return materialFrom; + } + + public void setMaterialFrom(String materialFrom) { + this.materialFrom = materialFrom; + } + public String getCheckLocName() { return checkLocName; } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index c1ccc02b1..f08d93e35 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -412,7 +412,10 @@ public class SapItemSyncImpl implements SapItemSyncService { qcCheckTaskIncomeDTO.setRecordId(IdUtils.fastSimpleUUID()); qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); qcCheckTaskIncomeDTO.setTypeCode("material"); - qcCheckTaskIncomeDTO.setOrderType("bc");//包材 + /**8010 榄菊成品；8020 榄菊半成品；8030 榄菊原材料；8040 榄菊包装材料；8050 榄菊塑料五金电子；8060 榄菊辅助用品 + ；8061 榄菊办公用品；8062 榄菊劳保用品；8070 榄菊广宣品；8090 榄菊未估价的物料**/ + qcCheckTaskIncomeDTO.setOrderType(maraTable.getString("MTART"));//物料类型 + qcCheckTaskIncomeDTO.setAttr4(maraTable.getString("MTBEZ"));//物料类型描述 qcCheckTaskIncomeDTO.setOrderNo(maraTable.getString("EBELN"));//采购订单 qcCheckTaskIncomeDTO.setSupplierCode(maraTable.getString("LIFNR")); qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM")); From 216911b8c0a743d3a5767319f45afce0c74e50e3 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 9 Apr 2024 09:18:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9D=A5=E6=96=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9D=A5=E6=96=99=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/quality/QcCheckTaskIncomeDTO.java | 9 +++++++++ .../java/com/op/mes/mapper/MesReportWorkMapper.java | 3 +++ .../op/mes/service/impl/IWCInterfaceServiceImpl.java | 8 ++++++++ .../main/resources/mapper/mes/MesReportWorkMapper.xml | 8 +++++++- .../java/com/op/quality/domain/QcCheckTaskIncome.java | 10 ++++++++++ .../service/impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../mapper/quality/QcCheckTaskIncomeMapper.xml | 11 +++++++++-- .../java/com/op/sap/service/impl/SapItemSyncImpl.java | 2 +- 8 files changed, 48 insertions(+), 5 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java index 59646ec0c..bbce241d3 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java @@ -136,6 +136,15 @@ public class QcCheckTaskIncomeDTO extends BaseEntity { private BigDecimal bNoOkquality; private BigDecimal cNoOkquality; private String orderType; + private String orderTypeDesc; + + public String getOrderTypeDesc() { + return orderTypeDesc; + } + + public void setOrderTypeDesc(String orderTypeDesc) { + this.orderTypeDesc = orderTypeDesc; + } public String getOrderType() { return orderType; 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 a17fb24a3..595d4cbcf 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 @@ -1,5 +1,6 @@ package com.op.mes.mapper; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -144,4 +145,6 @@ public interface MesReportWorkMapper { int updateAttr2(MesReportWork workorder); void updateReportRemark(@Param("list") List mesReportWork); + + BigDecimal getReportRate(String productCode); } 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 a5ae95022..a11e4b73f 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 @@ -37,6 +37,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; @@ -372,6 +373,13 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { if(sHzWorks==null){ return R.fail("未查询到子报工单"); } + //查询base_product的report_rate//箱子-大盒-小盒 + BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(0).getProductCode()); + if(reportRate != null){ + BigDecimal newQuantity = sHzWorks.getQuantityFeedback().divide(reportRate,2, RoundingMode.HALF_UP); + sHzWorks.setQuantityFeedback(newQuantity); + } + //子工单报工 logger.info("==========================子工单报工开始"); sapRson = this.reportHzToSap(sHzWorks); 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 acacc7ff2..3e00b613b 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 @@ -473,7 +473,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into mes_report_work diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 421cf69f7..5d1e0c9ce 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -168,6 +168,7 @@ public class QcCheckTaskIncome extends BaseEntity { */ private String delFlag; private String orderType; + private String orderTypeDesc; private String incomeTimeStart; private String incomeTimeEnd; private String checkTimeStart; @@ -195,6 +196,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String materialType;//来料类别 private String materialFrom;//物料来源 + + public String getOrderTypeDesc() { + return orderTypeDesc; + } + + public void setOrderTypeDesc(String orderTypeDesc) { + this.orderTypeDesc = orderTypeDesc; + } + public String getMaterialType() { return materialType; } 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 6487e0286..4ef7ca3ff 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 @@ -256,7 +256,7 @@ public class QcCheckTaskIncomeServiceImpl implements } } qcCheckTaskIncome.setNoOkQuality(noOkQuality); - /**qc_check_task**/ + /**qc_check_task**///------------------zxl qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); /**qc_check_task_detail**/ 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 dff8c47cf..2cf55975f 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 @@ -36,13 +36,17 @@ + + + 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, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, - create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality + create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality, + order_type,order_type_desc from qc_check_task @@ -52,7 +56,7 @@ 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.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality, - qct.sample_quality, qct.type_code + qct.sample_quality, qct.type_code, qct.order_type from qc_check_task qct and qct.check_no = #{checkNo} @@ -83,6 +87,7 @@ and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120) and qct.check_type = #{checkType} and qct.type_code = #{typeCode} + and qct.order_type = #{orderType} order by qct.create_time DESC @@ -208,6 +213,7 @@ type_code, sample_quality, order_type, + order_type_desc, #{recordId}, @@ -243,6 +249,7 @@ #{typeCode}, #{sampleQuality}, #{orderType}, + #{orderTypeDesc}, diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index f08d93e35..b72170cab 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -415,7 +415,7 @@ public class SapItemSyncImpl implements SapItemSyncService { /**8010 榄菊成品；8020 榄菊半成品；8030 榄菊原材料；8040 榄菊包装材料；8050 榄菊塑料五金电子；8060 榄菊辅助用品 ；8061 榄菊办公用品；8062 榄菊劳保用品；8070 榄菊广宣品；8090 榄菊未估价的物料**/ qcCheckTaskIncomeDTO.setOrderType(maraTable.getString("MTART"));//物料类型 - qcCheckTaskIncomeDTO.setAttr4(maraTable.getString("MTBEZ"));//物料类型描述 + qcCheckTaskIncomeDTO.setOrderTypeDesc(maraTable.getString("MTBEZ"));//物料类型描述 qcCheckTaskIncomeDTO.setOrderNo(maraTable.getString("EBELN"));//采购订单 qcCheckTaskIncomeDTO.setSupplierCode(maraTable.getString("LIFNR")); qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM")); From 27e3852e3730e9523c4ab96bee187c9ae1824180 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 9 Apr 2024 14:13:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?SAP=E5=B7=A5=E5=8D=95=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/sap/service/impl/SapOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e6abf465d..22030e795 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 @@ -242,7 +242,7 @@ public class SapOrderServiceImpl implements SapOrderService { for (String orderCode : sapCloseOrderQuery.getOrderCodes()) { jCoParameterList.setValue("P_AUFNR", orderCode); func.execute(dest);//执行调用函数 - String L_MSG1 = func.getExportParameterList().getString("L_MSG"); + String L_MSG1 = func.getExportParameterList().getString("MSG"); Msg.append(orderCode + "-" + L_MSG1 + ";"); } From 78593150388548c6f332aca7521f42851ace848d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 9 Apr 2024 14:23:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/sap/service/impl/SapOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e6abf465d..22030e795 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 @@ -242,7 +242,7 @@ public class SapOrderServiceImpl implements SapOrderService { for (String orderCode : sapCloseOrderQuery.getOrderCodes()) { jCoParameterList.setValue("P_AUFNR", orderCode); func.execute(dest);//执行调用函数 - String L_MSG1 = func.getExportParameterList().getString("L_MSG"); + String L_MSG1 = func.getExportParameterList().getString("MSG"); Msg.append(orderCode + "-" + L_MSG1 + ";"); } From b5cd9e76f250a50e07883f3b48b439851d5ce6ab Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 9 Apr 2024 14:27:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/service/impl/QcUserMaterialServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java index cd499ab83..461ae50d8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java @@ -201,6 +201,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { String[] userNames = qcUserMaterial.getUserNames(); String materialCode = qcUserMaterial.getMaterialCode(); String materialName = qcUserMaterial.getMaterialName(); + String attr1 = qcUserMaterial.getAttr1(); String user = SecurityUtils.getUsername(); //插入数据 for (int i = 0; i < userCodes.length; i++) { @@ -212,6 +213,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { qcUserMaterialDto.setUserName(userNames[i]); qcUserMaterialDto.setMaterialCode(materialCode); qcUserMaterialDto.setMaterialName(materialName); + qcUserMaterialDto.setAttr1(attr1); qcUserMaterialDto.setFactoryCode(factoryCode); count += qcUserMaterialMapper.insertQcUserMaterial(qcUserMaterialDto); } From 3dd63e2288a990b0d923bc2a16516c963be79263 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 9 Apr 2024 14:34:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BA=BF=E4=BD=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/MesLineController.java | 109 +++++++++ .../main/java/com/op/mes/domain/MesLine.java | 202 ++++++++++++++++ .../com/op/mes/domain/MesLineProcess.java | 182 ++++++++++++++ .../java/com/op/mes/mapper/MesLineMapper.java | 67 ++++++ .../op/mes/mapper/MesLineProcessMapper.java | 67 ++++++ .../mes/service/IMesLineProcessService.java | 64 +++++ .../com/op/mes/service/IMesLineService.java | 66 +++++ .../impl/MesLineProcessServiceImpl.java | 110 +++++++++ .../mes/service/impl/MesLineServiceImpl.java | 164 +++++++++++++ .../resources/mapper/mes/MesLineMapper.xml | 150 ++++++++++++ .../mapper/mes/MesLineProcessMapper.xml | 226 ++++++++++++++++++ 11 files changed, 1407 insertions(+) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java new file mode 100644 index 000000000..55951d6f0 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java @@ -0,0 +1,109 @@ +package com.op.mes.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.nacos.shaded.com.google.protobuf.Internal; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.mes.domain.MesLine; +import com.op.mes.service.IMesLineService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 线体管理Controller + * + * @author Open Platform + * @date 2024-04-02 + */ +@RestController +@RequestMapping("/mesLine") +public class MesLineController extends BaseController { + @Autowired + private IMesLineService mesLineService; + +/** + * 查询线体管理列表 + */ +@RequiresPermissions("mes:mesLine:list") +@GetMapping("/list") + public TableDataInfo list(MesLine mesLine) { + startPage(); + List list = mesLineService.selectMesLineList(mesLine); + return getDataTable(list); + } + + /** + * 导出线体管理列表 + */ + @RequiresPermissions("mes:mesLine:export") + @Log(title = "线体管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesLine mesLine) { + List list = mesLineService.selectMesLineList(mesLine); + ExcelUtil util = new ExcelUtil(MesLine. class); + util.exportExcel(response, list, "线体管理数据"); + } + + /** + * 获取线体管理详细信息 + */ + @RequiresPermissions("mes:mesLine:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(mesLineService.selectMesLineById(id)); + } + + /** + * 新增线体管理 + */ + @RequiresPermissions("mes:mesLine:add") + @Log(title = "线体管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesLine mesLine) { + return toAjax(mesLineService.insertMesLine(mesLine)); + } + + /** + * 修改线体管理 + */ + @RequiresPermissions("mes:mesLine:edit") + @Log(title = "线体管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesLine mesLine) { + return toAjax(mesLineService.updateMesLine(mesLine)); + } + + /** + * 删除线体管理 + */ + @RequiresPermissions("mes:mesLine:remove") + @Log(title = "线体管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(mesLineService.deleteMesLineByIds(ids)); + } + /** + * 选择线体 + */ + @GetMapping("/selectLineBody") + public TableDataInfo selectLineBody(MesLine mesLine) { + startPage(); + List list = mesLineService.selectLineBody(mesLine); + return getDataTable(list); + } +} + diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java new file mode 100644 index 000000000..498fc898f --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java @@ -0,0 +1,202 @@ +package com.op.mes.domain; + +import java.math.BigDecimal; +import java.util.List; + +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; + +/** + * 线体管理对象 mes_line + * + * @author Open Platform + * @date 2024-04-02 + */ +public class MesLine extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 线体编码 + */ + @Excel(name = "线体编码") + private String lineCode; + + /** + * 线体名称 + */ + @Excel(name = "线体名称") + private String lineName; + + /** + * 标准用人 + */ + @Excel(name = "标准用人") + private Long useMan; + + /** + * 标准效率 + */ + @Excel(name = "标准效率") + private BigDecimal efficiency; + + /** + * 检验工具 + */ + @Excel(name = "检验工具") + private String attr1; + + /** + * $column.columnComment + */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr2; + + /** + * $column.columnComment + */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr3; + + /** + * 预留字段1 + */ + @Excel(name = "预留字段1") + private String attr4; + + /** + * 工厂编码 + */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** + * 删除标识1删除0正常 + */ + private String delFlag; + + private List processList; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public String getLineCode() { + return lineCode; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } + + public String getLineName() { + return lineName; + } + + public void setUseMan(Long useMan) { + this.useMan = useMan; + } + + public Long getUseMan() { + return useMan; + } + + public void setEfficiency(BigDecimal efficiency) { + this.efficiency = efficiency; + } + + public BigDecimal getEfficiency() { + return efficiency; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getProcessList() { + return processList; + } + + public void setProcessList(List processList) { + this.processList = processList; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("lineCode", getLineCode()) + .append("lineName", getLineName()) + .append("useMan", getUseMan()) + .append("efficiency", getEfficiency()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java new file mode 100644 index 000000000..7679fe848 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java @@ -0,0 +1,182 @@ +package com.op.mes.domain; + +import java.math.BigDecimal; +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; + +/** + * 线体管理对象 mes_line_process + * + * @author Open Platform + * @date 2024-04-07 + */ +public class MesLineProcess extends BaseEntity { +private static final long serialVersionUID=1L; + + /** id */ + private String id; + + /** 父级id */ + @Excel(name = "父级id") + private String belongTo; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String processCode; + + /** 工艺名称 */ + @Excel(name = "工艺名称") + private String processName; + + /** 数量 */ + @Excel(name = "数量") + private BigDecimal quality; + + /** 检验工具 */ + @Excel(name = "检验工具") + private String attr1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr3; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + /** 所属线体编码 */ + @Excel(name = "所属线体编码") + private String lineCode; + + /** 所属线体名称 */ + @Excel(name = "所属线体名称") + private String lineName; + + public void setId(String id){ + this.id = id; + } + + public String getId(){ + return id; + } + public void setBelongTo(String belongTo){ + this.belongTo = belongTo; + } + + public String getBelongTo(){ + return belongTo; + } + public void setProcessCode(String processCode){ + this.processCode = processCode; + } + + public String getProcessCode(){ + return processCode; + } + public void setProcessName(String processName){ + this.processName = processName; + } + + public String getProcessName(){ + return processName; + } + public void setQuality(BigDecimal quality){ + this.quality = quality; + } + + public BigDecimal getQuality(){ + return quality; + } + public void setAttr1(String attr1){ + this.attr1 = attr1; + } + + public String getAttr1(){ + return attr1; + } + public void setAttr2(String attr2){ + this.attr2 = attr2; + } + + public String getAttr2(){ + return attr2; + } + public void setAttr3(String attr3){ + this.attr3 = attr3; + } + + public String getAttr3(){ + return attr3; + } + public void setAttr4(String attr4){ + this.attr4 = attr4; + } + + public String getAttr4(){ + return attr4; + } + public void setFactoryCode(String factoryCode){ + this.factoryCode = factoryCode; + } + + public String getFactoryCode(){ + return factoryCode; + } + public void setDelFlag(String delFlag){ + this.delFlag = delFlag; + } + + public String getDelFlag(){ + return delFlag; + } + public void setLineCode(String lineCode){ + this.lineCode = lineCode; + } + + public String getLineCode(){ + return lineCode; + } + public void setLineName(String lineName){ + this.lineName = lineName; + } + + public String getLineName(){ + return lineName; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id",getId()) + .append("belongTo",getBelongTo()) + .append("processCode",getProcessCode()) + .append("processName",getProcessName()) + .append("quality",getQuality()) + .append("attr1",getAttr1()) + .append("attr2",getAttr2()) + .append("attr3",getAttr3()) + .append("attr4",getAttr4()) + .append("createBy",getCreateBy()) + .append("createTime",getCreateTime()) + .append("updateBy",getUpdateBy()) + .append("updateTime",getUpdateTime()) + .append("factoryCode",getFactoryCode()) + .append("delFlag",getDelFlag()) + .append("lineCode",getLineCode()) + .append("lineName",getLineName()) + .toString(); + } + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java new file mode 100644 index 000000000..97da40962 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java @@ -0,0 +1,67 @@ +package com.op.mes.mapper; + +import java.util.List; + +import com.op.mes.domain.MesLine; +import org.apache.ibatis.annotations.Mapper; + +/** + * 线体管理Mapper接口 + * + * @author Open Platform + * @date 2024-04-02 + */ +@Mapper +public interface MesLineMapper { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLine selectMesLineById(String id); + + /** + * 查询线体管理列表 + * + * @param mesLine 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineList(MesLine mesLine); + + /** + * 新增线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int insertMesLine(MesLine mesLine); + + /** + * 修改线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int updateMesLine(MesLine mesLine); + + /** + * 删除线体管理 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineById(String id); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesLineByIds(String[] ids); + /** + * 选择线体 + */ + public List selectLineBody(MesLine mesLine); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java new file mode 100644 index 000000000..74d67f633 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java @@ -0,0 +1,67 @@ +package com.op.mes.mapper; + +import java.util.List; + +import com.op.mes.domain.MesLineProcess; +import org.apache.ibatis.annotations.Mapper; + +/** + * 线体管理Mapper接口 + * + * @author Open Platform + * @date 2024-04-07 + */ +@Mapper +public interface MesLineProcessMapper { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLineProcess selectMesLineProcessById(String id); + + public List selectMesLineProcessByBelongTo(String belongTo); + + /** + * 查询线体管理列表 + * + * @param mesLineProcess 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineProcessList(MesLineProcess mesLineProcess); + + /** + * 新增线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int insertMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 修改线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int updateMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 删除线体管理 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineProcessById(String id); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesLineProcessByIds(String[] ids); + + public int deleteMesLineProcessByBelongTo(String belongTo); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java new file mode 100644 index 000000000..9fc677f87 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java @@ -0,0 +1,64 @@ +package com.op.mes.service; + +import java.util.List; + +import com.op.mes.domain.MesLineProcess; + +/** + * 线体管理Service接口 + * + * @author Open Platform + * @date 2024-04-07 + */ +public interface IMesLineProcessService { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLineProcess selectMesLineProcessById(String id); + public List selectMesLineProcessByBelongTo(String belongTo); + + /** + * 查询线体管理列表 + * + * @param mesLineProcess 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineProcessList(MesLineProcess mesLineProcess); + + /** + * 新增线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int insertMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 修改线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int updateMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键集合 + * @return 结果 + */ + public int deleteMesLineProcessByIds(String[] ids); + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineProcessById(String id); + + public int deleteMesLineProcessByBelongTo(String belongTo); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java new file mode 100644 index 000000000..7c8cd0fe7 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java @@ -0,0 +1,66 @@ +package com.op.mes.service; + +import java.util.List; + +import com.op.mes.domain.MesLine; + +/** + * 线体管理Service接口 + * + * @author Open Platform + * @date 2024-04-02 + */ +public interface IMesLineService { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLine selectMesLineById(String id); + + /** + * 查询线体管理列表 + * + * @param mesLine 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineList(MesLine mesLine); + + /** + * 新增线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int insertMesLine(MesLine mesLine); + + /** + * 修改线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int updateMesLine(MesLine mesLine); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键集合 + * @return 结果 + */ + public int deleteMesLineByIds(String[] ids); + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineById(String id); + + /** + * 选择线体 + */ + public List selectLineBody(MesLine mesLine); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java new file mode 100644 index 000000000..b6480efb4 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java @@ -0,0 +1,110 @@ +package com.op.mes.service.impl; + +import java.util.List; + +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.MesLineProcessMapper; +import com.op.mes.domain.MesLineProcess; +import com.op.mes.service.IMesLineProcessService; + +/** + * 线体管理Service业务层处理 + * + * @author Open Platform + * @date 2024-04-07 + */ +@Service +public class MesLineProcessServiceImpl implements IMesLineProcessService { + @Autowired + private MesLineProcessMapper mesLineProcessMapper; + + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public MesLineProcess selectMesLineProcessById(String id) { + return mesLineProcessMapper.selectMesLineProcessById(id); + } + + @Override + public List selectMesLineProcessByBelongTo(String belongTo) { + return mesLineProcessMapper.selectMesLineProcessByBelongTo(belongTo); + } + + /** + * 查询线体管理列表 + * + * @param mesLineProcess 线体管理 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public List selectMesLineProcessList(MesLineProcess mesLineProcess) { + return mesLineProcessMapper.selectMesLineProcessList(mesLineProcess); + } + + /** + * 新增线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertMesLineProcess(MesLineProcess mesLineProcess) { + mesLineProcess.setId(IdUtils.fastSimpleUUID()); + mesLineProcess.setCreateTime(DateUtils.getNowDate()); + mesLineProcess.setCreateBy(SecurityUtils.getUsername()); + return mesLineProcessMapper.insertMesLineProcess(mesLineProcess); + } + + /** + * 修改线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateMesLineProcess(MesLineProcess mesLineProcess) { + mesLineProcess.setUpdateTime(DateUtils.getNowDate()); + return mesLineProcessMapper.updateMesLineProcess(mesLineProcess); + } + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键 + * @return 结果 + */ + @Override + public int deleteMesLineProcessByIds(String[] ids) { + return mesLineProcessMapper.deleteMesLineProcessByIds(ids); + } + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + @Override + public int deleteMesLineProcessById(String id) { + return mesLineProcessMapper.deleteMesLineProcessById(id); + } + + @Override + @DS("#header.poolName") + public int deleteMesLineProcessByBelongTo(String belongTo) { + return mesLineProcessMapper.deleteMesLineProcessByBelongTo(belongTo); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java new file mode 100644 index 000000000..862e8220c --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java @@ -0,0 +1,164 @@ +package com.op.mes.service.impl; + +import java.util.List; +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.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import com.op.mes.domain.MesLineProcess; +import com.op.mes.service.IMesLineProcessService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.MesLineMapper; +import com.op.mes.domain.MesLine; +import com.op.mes.service.IMesLineService; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * 线体管理Service业务层处理 + * + * @author Open Platform + * @date 2024-04-02 + */ +@Service +public class MesLineServiceImpl implements IMesLineService { + @Autowired + private MesLineMapper mesLineMapper; + + @Autowired + private IMesLineProcessService mesLineProcessService; + + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public MesLine selectMesLineById(String id) { + //查询时回显线体工艺数据 + List mesList = mesLineProcessService.selectMesLineProcessByBelongTo(id); + List processList = mesList.stream().map(MesLineProcess::getProcessName).collect(Collectors.toList()); + MesLine mesLine = mesLineMapper.selectMesLineById(id); + //设置线体数据 + if (!CollectionUtils.isEmpty(processList)) { + mesLine.setProcessList(processList); + } + return mesLine; + } + + /** + * 查询线体管理列表 + * + * @param mesLine 线体管理 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public List selectMesLineList(MesLine mesLine) { + return mesLineMapper.selectMesLineList(mesLine); + } + + /** + * 新增线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertMesLine(MesLine mesLine) { + mesLine.setCreateTime(DateUtils.getNowDate()); + mesLine.setCreateBy(SecurityUtils.getUsername()); + mesLine.setId(IdUtils.fastSimpleUUID()); + // 获取工厂编码 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + mesLine.setFactoryCode(factoryCode); + return mesLineMapper.insertMesLine(mesLine); + } + + /** + * 修改线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + @Transactional(propagation = Propagation.REQUIRED) + public int updateMesLine(MesLine mesLine) { + mesLine.setUpdateTime(DateUtils.getNowDate()); + mesLine.setUpdateBy(SecurityUtils.getUsername()); + List processList = mesLine.getProcessList(); + int flag = 0; + if (!CollectionUtils.isEmpty(processList)) { + //删除旧的工艺项 + mesLineProcessService.deleteMesLineProcessByBelongTo(mesLine.getId()); + + String belongTo = mesLine.getId(); + String lineCode = mesLine.getLineCode(); + String lineName = mesLine.getLineName(); + // 获取工厂编码 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + + for (String processName : processList ) { + MesLineProcess mesLineProcess = new MesLineProcess(); + mesLineProcess.setBelongTo(belongTo); + mesLineProcess.setProcessName(processName); + mesLineProcess.setLineCode(lineCode); + mesLineProcess.setLineName(lineName); + mesLineProcess.setFactoryCode(factoryCode); + flag += mesLineProcessService.insertMesLineProcess(mesLineProcess); + } + }else { + return 0; + } + if (flag > 0){ + return mesLineMapper.updateMesLine(mesLine); + }else { + return 0; + } + } + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteMesLineByIds(String[] ids) { + return mesLineMapper.deleteMesLineByIds(ids); + } + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + @Override + public int deleteMesLineById(String id) { + return mesLineMapper.deleteMesLineById(id); + } + + @Override + @DS("#header.poolName") + public List selectLineBody(MesLine mesLine) { + return mesLineMapper.selectLineBody(mesLine); + } +} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml new file mode 100644 index 000000000..4f75e67d9 --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, line_code, line_name, use_man, efficiency, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from mes_line + + + + + + + + insert into mes_line + + id, + line_code, + line_name, + use_man, + efficiency, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + + + #{id}, + #{lineCode}, + #{lineName}, + #{useMan}, + #{efficiency}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + + + + + update mes_line + + line_code = #{lineCode}, + line_name = #{lineName}, + use_man = #{useMan}, + efficiency = #{efficiency}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag =#{delFlag}, + + where id = #{id} + + + + update mes_line set del_flag = '1' where id = #{id} + + + + update mes_line set del_flag = '1' where id in + + #{id} + + + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml new file mode 100644 index 000000000..ebda3ea32 --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, belong_to, process_code, process_name, quality, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag, line_code, line_name from mes_line_process + + + + + + + + + insert into mes_line_process + + id, + + belong_to, + + process_code, + + process_name, + + quality, + + attr1, + + attr2, + + attr3, + + attr4, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + line_code, + + line_name, + + + + #{id}, + + #{belongTo}, + + #{processCode}, + + #{processName}, + + #{quality}, + + #{attr1}, + + #{attr2}, + + #{attr3}, + + #{attr4}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + #{lineCode}, + + #{lineName}, + + + + + + update mes_line_process + + belong_to = + #{belongTo}, + + process_code = + #{processCode}, + + process_name = + #{processName}, + + quality = + #{quality}, + + attr1 = + #{attr1}, + + attr2 = + #{attr2}, + + attr3 = + #{attr3}, + + attr4 = + #{attr4}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + line_code = + #{lineCode}, + + line_name = + #{lineName}, + + + where id = #{id} + + + + delete from mes_line_process where id = #{id} + + + + delete from mes_line_process where id in + + #{id} + + + + delete from mes_line_process where belong_to = #{belongTo} + + +