From dcbde38d278be019188a9ea8847eec2b2a00c217 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 23 Oct 2023 18:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E8=AE=B0=E5=BD=95V1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/EquOrderController.java | 119 ++++----- .../java/com/op/device/domain/EquOrder.java | 42 ++++ .../com/op/device/domain/EquOrderDetail.java | 205 ++++++++++++++++ .../com/op/device/domain/EquOrderEqu.java | 169 +++++++++++++ .../com/op/device/domain/EquOrderPerson.java | 133 ++++++++++ .../op/device/domain/EquOrderStandard.java | 230 ++++++++++++++++++ .../device/mapper/EquOrderDetailMapper.java | 68 ++++++ .../op/device/mapper/EquOrderEquMapper.java | 68 ++++++ .../com/op/device/mapper/EquOrderMapper.java | 18 +- .../device/mapper/EquOrderPersonMapper.java | 61 +++++ .../device/mapper/EquOrderStandardMapper.java | 68 ++++++ .../op/device/service/IEquOrderService.java | 8 +- .../service/impl/EquOrderServiceImpl.java | 61 ++++- .../mapper/device/EquOrderDetailMapper.xml | 138 +++++++++++ .../mapper/device/EquOrderEquMapper.xml | 123 ++++++++++ .../mapper/device/EquOrderMapper.xml | 12 +- .../mapper/device/EquOrderPersonMapper.xml | 108 ++++++++ .../mapper/device/EquOrderStandardMapper.xml | 153 ++++++++++++ 18 files changed, 1712 insertions(+), 72 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquOrderEqu.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquOrderPerson.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java index 6a278a3f5..1cab8e2ee 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java @@ -2,6 +2,7 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -23,75 +24,75 @@ import com.op.common.core.web.page.TableDataInfo; /** * 计划工单Controller - * + * * @author wws * @date 2023-10-23 */ @RestController @RequestMapping("/deviceOrder") public class EquOrderController extends BaseController { - @Autowired - private IEquOrderService equOrderService; + @Autowired + private IEquOrderService equOrderService; - /** - * 查询计划工单列表 - */ - @RequiresPermissions("device:deviceOrder:list") - @GetMapping("/list") - public TableDataInfo list(EquOrder equOrder) { - startPage(); - List list = equOrderService.selectEquOrderList(equOrder); - return getDataTable(list); - } + /** + * 查询计划工单列表 + */ + @RequiresPermissions("device:deviceOrder:list") + @GetMapping("/list") + public TableDataInfo list(EquOrder equOrder) { + startPage(); + List list = equOrderService.selectEquOrderList(equOrder); + return getDataTable(list); + } - /** - * 导出计划工单列表 - */ - @RequiresPermissions("device:deviceOrder:export") - @Log(title = "计划工单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EquOrder equOrder) { - List list = equOrderService.selectEquOrderList(equOrder); - ExcelUtil util = new ExcelUtil(EquOrder.class); - util.exportExcel(response, list, "计划工单数据"); - } + /** + * 导出计划工单列表 + */ + @RequiresPermissions("device:deviceOrder:export") + @Log(title = "计划工单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquOrder equOrder) { + List list = equOrderService.selectEquOrderList(equOrder); + ExcelUtil util = new ExcelUtil(EquOrder.class); + util.exportExcel(response, list, "计划工单数据"); + } - /** - * 获取计划工单详细信息 - */ - @RequiresPermissions("device:deviceOrder:query") - @GetMapping(value = "/{orderId}") - public AjaxResult getInfo(@PathVariable("orderId") String orderId) { - return success(equOrderService.selectEquOrderByOrderId(orderId)); - } + /** + * 获取计划工单详细信息 + */ + @RequiresPermissions("device:deviceOrder:query") + @GetMapping(value = "/{orderCode}") + public AjaxResult getInfo(@PathVariable("orderCode") String orderCode) { + return success(equOrderService.selectEquOrderByOrderCode(orderCode)); + } - /** - * 新增计划工单 - */ - @RequiresPermissions("device:deviceOrder:add") - @Log(title = "计划工单", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody EquOrder equOrder) { - return toAjax(equOrderService.insertEquOrder(equOrder)); - } + /** + * 新增计划工单 + */ + @RequiresPermissions("device:deviceOrder:add") + @Log(title = "计划工单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquOrder equOrder) { + return equOrderService.insertEquOrder(equOrder); + } - /** - * 修改计划工单 - */ - @RequiresPermissions("device:deviceOrder:edit") - @Log(title = "计划工单", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EquOrder equOrder) { - return toAjax(equOrderService.updateEquOrder(equOrder)); - } + /** + * 修改计划工单 + */ + @RequiresPermissions("device:deviceOrder:edit") + @Log(title = "计划工单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquOrder equOrder) { + return toAjax(equOrderService.updateEquOrder(equOrder)); + } - /** - * 删除计划工单 - */ - @RequiresPermissions("device:deviceOrder:remove") - @Log(title = "计划工单", businessType = BusinessType.DELETE) - @DeleteMapping("/{orderIds}") - public AjaxResult remove(@PathVariable String[] orderIds) { - return toAjax(equOrderService.deleteEquOrderByOrderIds(orderIds)); - } + /** + * 删除计划工单 + */ + @RequiresPermissions("device:deviceOrder:remove") + @Log(title = "计划工单", businessType = BusinessType.DELETE) + @DeleteMapping("/{orderIds}") + public AjaxResult remove(@PathVariable String[] orderIds) { + return toAjax(equOrderService.deleteEquOrderByOrderIds(orderIds)); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index 019e0f327..2ea8e17c4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -2,6 +2,8 @@ package com.op.device.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -116,6 +118,46 @@ public class EquOrder extends BaseEntity { @Excel(name = "删除标志") private String delFlag; + private List equList; + + private String planName; + + private String workCenterName; + + private List timeArray; + + public List getTimeArray() { + return timeArray; + } + + public void setTimeArray(List timeArray) { + this.timeArray = timeArray; + } + + public String getWorkCenterName() { + return workCenterName; + } + + public void setWorkCenterName(String workCenterName) { + this.workCenterName = workCenterName; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public List getEquList() { + return equList; + } + + public void setEquList(List equList) { + this.equList = equList; + } + public void setOrderId(String orderId) { this.orderId = orderId; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java new file mode 100644 index 000000000..25b1ebecc --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java @@ -0,0 +1,205 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.List; + +/** + * 计划工单详情-检查项信息对象 equ_order_detail + * + * @author Open Platform + * @date 2023-10-23 + */ +public class EquOrderDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 检查项编码 */ + @Excel(name = "检查项编码") + private String code; + + /** 工单编码 */ + @Excel(name = "工单编码") + private String orderCode; + + /** 关联上级表单 */ + @Excel(name = "关联上级表单") + private String parentCode; + + /** 检查项编码 */ + @Excel(name = "检查项编码") + private String itemCode; + + /** 检查项名称 */ + @Excel(name = "检查项名称") + private String itemName; + + /** 检查项方法/工具 */ + @Excel(name = "检查项方法/工具") + private String itemMethod; + + /** 维护类型 */ + @Excel(name = "维护类型") + private String itemType; + + /** 维护类型名称 */ + @Excel(name = "维护类型名称") + private String itemTypeName; + + /** 工厂 */ + @Excel(name = "工厂") + private String factroyCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + private List standardList; + + public List getStandardList() { + return standardList; + } + + public void setStandardList(List standardList) { + this.standardList = standardList; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setCode(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderCode() { + return orderCode; + } + public void setParentCode(String parentCode) { + this.parentCode = parentCode; + } + + public String getParentCode() { + return parentCode; + } + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemCode() { + return itemCode; + } + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getItemName() { + return itemName; + } + public void setItemMethod(String itemMethod) { + this.itemMethod = itemMethod; + } + + public String getItemMethod() { + return itemMethod; + } + public void setItemType(String itemType) { + this.itemType = itemType; + } + + public String getItemType() { + return itemType; + } + public void setItemTypeName(String itemTypeName) { + this.itemTypeName = itemTypeName; + } + + public String getItemTypeName() { + return itemTypeName; + } + public void setFactroyCode(String factroyCode) { + this.factroyCode = factroyCode; + } + + public String getFactroyCode() { + return factroyCode; + } + 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 setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("code", getCode()) + .append("orderCode", getOrderCode()) + .append("parentCode", getParentCode()) + .append("itemCode", getItemCode()) + .append("itemName", getItemName()) + .append("itemMethod", getItemMethod()) + .append("itemType", getItemType()) + .append("itemTypeName", getItemTypeName()) + .append("factroyCode", getFactroyCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderEqu.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderEqu.java new file mode 100644 index 000000000..224b9e7d1 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderEqu.java @@ -0,0 +1,169 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.List; + +/** + * 计划工单-设备对象 equ_order_equ + * + * @author Open Platform + * @date 2023-10-23 + */ +public class EquOrderEqu extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 计划详情-设备编码 */ + @Excel(name = "计划详情-设备编码") + private String code; + + /** 关联上级表单 */ + @Excel(name = "关联上级表单") + private String parentCode; + + /** 工单code */ + @Excel(name = "工单code") + private String orderCode; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipmentName; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标识 */ + private String delFlag; + + private List detailList; + + public List getDetailList() { + return detailList; + } + + public void setDetailList(List detailList) { + this.detailList = detailList; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setCode(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + public void setParentCode(String parentCode) { + this.parentCode = parentCode; + } + + public String getParentCode() { + return parentCode; + } + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderCode() { + return orderCode; + } + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getEquipmentCode() { + return equipmentCode; + } + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentName() { + return equipmentName; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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 setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("code", getCode()) + .append("parentCode", getParentCode()) + .append("orderCode", getOrderCode()) + .append("equipmentCode", getEquipmentCode()) + .append("equipmentName", getEquipmentName()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderPerson.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderPerson.java new file mode 100644 index 000000000..efcd84894 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderPerson.java @@ -0,0 +1,133 @@ +package com.op.device.domain; + +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; + +/** + * 计划工单-人员对象 equ_order_person + * + * @author Open Platform + * @date 2023-10-23 + */ +public class EquOrderPerson extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 工单编码 */ + @Excel(name = "工单编码") + private String orderCode; + + /** 用户id */ + @Excel(name = "用户id") + private Long userId; + + /** 账号 */ + @Excel(name = "账号") + private String userName; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标识 */ + private String delFlag; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderCode() { + return orderCode; + } + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getUserId() { + return userId; + } + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserName() { + return userName; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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 setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orderCode", getOrderCode()) + .append("userId", getUserId()) + .append("userName", getUserName()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java new file mode 100644 index 000000000..441fc9cae --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java @@ -0,0 +1,230 @@ +package com.op.device.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; + +/** + * 计划工单-标准对象 equ_order_standard + * + * @author Open Platform + * @date 2023-10-23 + */ +public class EquOrderStandard extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 编码 */ + @Excel(name = "编码") + private String code; + + /** 关联上级表单 */ + @Excel(name = "关联上级表单") + private String parentCode; + + /** 工单编码 */ + @Excel(name = "工单编码") + private String orderCode; + + /** 标准类型 */ + @Excel(name = "标准类型") + private String standardType; + + /** 标准名称 */ + @Excel(name = "标准名称") + private String standardName; + + /** 上限 */ + @Excel(name = "上限") + private BigDecimal detailUpLimit; + + /** 下限 */ + @Excel(name = "下限") + private BigDecimal detailDownLimit; + + /** 单位 */ + @Excel(name = "单位") + private String detailUnit; + + /** 达标 */ + @Excel(name = "达标") + private String detailReach; + + /** 实际值 */ + @Excel(name = "实际值") + private BigDecimal actualValue; + + /** 是否异常 */ + @Excel(name = "是否异常") + private String detailError; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标识 */ + private String delFlag; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setCode(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + public void setParentCode(String parentCode) { + this.parentCode = parentCode; + } + + public String getParentCode() { + return parentCode; + } + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderCode() { + return orderCode; + } + public void setStandardType(String standardType) { + this.standardType = standardType; + } + + public String getStandardType() { + return standardType; + } + public void setStandardName(String standardName) { + this.standardName = standardName; + } + + public String getStandardName() { + return standardName; + } + public void setDetailUpLimit(BigDecimal detailUpLimit) { + this.detailUpLimit = detailUpLimit; + } + + public BigDecimal getDetailUpLimit() { + return detailUpLimit; + } + public void setDetailDownLimit(BigDecimal detailDownLimit) { + this.detailDownLimit = detailDownLimit; + } + + public BigDecimal getDetailDownLimit() { + return detailDownLimit; + } + public void setDetailUnit(String detailUnit) { + this.detailUnit = detailUnit; + } + + public String getDetailUnit() { + return detailUnit; + } + public void setDetailReach(String detailReach) { + this.detailReach = detailReach; + } + + public String getDetailReach() { + return detailReach; + } + public void setActualValue(BigDecimal actualValue) { + this.actualValue = actualValue; + } + + public BigDecimal getActualValue() { + return actualValue; + } + public void setDetailError(String detailError) { + this.detailError = detailError; + } + + public String getDetailError() { + return detailError; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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 setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("code", getCode()) + .append("parentCode", getParentCode()) + .append("orderCode", getOrderCode()) + .append("standardType", getStandardType()) + .append("standardName", getStandardName()) + .append("detailUpLimit", getDetailUpLimit()) + .append("detailDownLimit", getDetailDownLimit()) + .append("detailUnit", getDetailUnit()) + .append("detailReach", getDetailReach()) + .append("actualValue", getActualValue()) + .append("detailError", getDetailError()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java new file mode 100644 index 000000000..d6611e4a3 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java @@ -0,0 +1,68 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquOrderDetail; + +/** + * 计划工单详情-检查项信息Mapper接口 + * + * @author Open Platform + * @date 2023-10-23 + */ +public interface EquOrderDetailMapper { + /** + * 查询计划工单详情-检查项信息 + * + * @param id 计划工单详情-检查项信息主键 + * @return 计划工单详情-检查项信息 + */ + public EquOrderDetail selectEquOrderDetailById(String id); + + /** + * 查询计划工单详情-检查项信息列表 + * + * @param equOrderDetail 计划工单详情-检查项信息 + * @return 计划工单详情-检查项信息集合 + */ + public List selectEquOrderDetailList(EquOrderDetail equOrderDetail); + + /** + * 新增计划工单详情-检查项信息 + * + * @param equOrderDetail 计划工单详情-检查项信息 + * @return 结果 + */ + public int insertEquOrderDetail(EquOrderDetail equOrderDetail); + + /** + * 修改计划工单详情-检查项信息 + * + * @param equOrderDetail 计划工单详情-检查项信息 + * @return 结果 + */ + public int updateEquOrderDetail(EquOrderDetail equOrderDetail); + + /** + * 删除计划工单详情-检查项信息 + * + * @param id 计划工单详情-检查项信息主键 + * @return 结果 + */ + public int deleteEquOrderDetailById(String id); + + /** + * 批量删除计划工单详情-检查项信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquOrderDetailByIds(String[] ids); + + /** + * 通过parentCode查询信息 + * @param code + * @return + */ + List selectEquOrderDetailByParentCode(String code); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java new file mode 100644 index 000000000..6ab3abcac --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java @@ -0,0 +1,68 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquOrderEqu; + +/** + * 计划工单-设备Mapper接口 + * + * @author Open Platform + * @date 2023-10-23 + */ +public interface EquOrderEquMapper { + /** + * 查询计划工单-设备 + * + * @param id 计划工单-设备主键 + * @return 计划工单-设备 + */ + public EquOrderEqu selectEquOrderEquById(String id); + + /** + * 查询计划工单-设备列表 + * + * @param equOrderEqu 计划工单-设备 + * @return 计划工单-设备集合 + */ + public List selectEquOrderEquList(EquOrderEqu equOrderEqu); + + /** + * 新增计划工单-设备 + * + * @param equOrderEqu 计划工单-设备 + * @return 结果 + */ + public int insertEquOrderEqu(EquOrderEqu equOrderEqu); + + /** + * 修改计划工单-设备 + * + * @param equOrderEqu 计划工单-设备 + * @return 结果 + */ + public int updateEquOrderEqu(EquOrderEqu equOrderEqu); + + /** + * 删除计划工单-设备 + * + * @param id 计划工单-设备主键 + * @return 结果 + */ + public int deleteEquOrderEquById(String id); + + /** + * 批量删除计划工单-设备 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquOrderEquByIds(String[] ids); + + /** + * 通过parentCode查询list + * @param orderCode + * @return + */ + List selectEquOrderEquListByParentCode(String orderCode); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 50bc438fa..11fe5c8df 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -14,10 +14,10 @@ public interface EquOrderMapper { /** * 查询计划工单 * - * @param orderId 计划工单主键 + * @param orderCode 计划工单主键 * @return 计划工单 */ - public EquOrder selectEquOrderByOrderId(String orderId); + public EquOrder selectEquOrderByOrderCode(String orderCode); /** * 查询计划工单列表 @@ -58,4 +58,18 @@ public interface EquOrderMapper { * @return 结果 */ public int deleteEquOrderByOrderIds(String[] orderIds); + + /** + * 通过code查询计划名称 + * @param orderCode + * @return + */ + String selectPlanNameByPlanCode(String orderCode); + + /** + * 通过工作中心code查询工作中心名称 + * @param planWorkshop + * @return + */ + String selectCenterNameByCenterCode(String planWorkshop); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java new file mode 100644 index 000000000..e581a8a39 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquOrderPerson; + +/** + * 计划工单-人员Mapper接口 + * + * @author Open Platform + * @date 2023-10-23 + */ +public interface EquOrderPersonMapper { + /** + * 查询计划工单-人员 + * + * @param id 计划工单-人员主键 + * @return 计划工单-人员 + */ + public EquOrderPerson selectEquOrderPersonById(String id); + + /** + * 查询计划工单-人员列表 + * + * @param equOrderPerson 计划工单-人员 + * @return 计划工单-人员集合 + */ + public List selectEquOrderPersonList(EquOrderPerson equOrderPerson); + + /** + * 新增计划工单-人员 + * + * @param equOrderPerson 计划工单-人员 + * @return 结果 + */ + public int insertEquOrderPerson(EquOrderPerson equOrderPerson); + + /** + * 修改计划工单-人员 + * + * @param equOrderPerson 计划工单-人员 + * @return 结果 + */ + public int updateEquOrderPerson(EquOrderPerson equOrderPerson); + + /** + * 删除计划工单-人员 + * + * @param id 计划工单-人员主键 + * @return 结果 + */ + public int deleteEquOrderPersonById(String id); + + /** + * 批量删除计划工单-人员 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquOrderPersonByIds(String[] ids); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java new file mode 100644 index 000000000..591682880 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java @@ -0,0 +1,68 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquOrderStandard; + +/** + * 计划工单-标准Mapper接口 + * + * @author Open Platform + * @date 2023-10-23 + */ +public interface EquOrderStandardMapper { + /** + * 查询计划工单-标准 + * + * @param id 计划工单-标准主键 + * @return 计划工单-标准 + */ + public EquOrderStandard selectEquOrderStandardById(String id); + + /** + * 查询计划工单-标准列表 + * + * @param equOrderStandard 计划工单-标准 + * @return 计划工单-标准集合 + */ + public List selectEquOrderStandardList(EquOrderStandard equOrderStandard); + + /** + * 新增计划工单-标准 + * + * @param equOrderStandard 计划工单-标准 + * @return 结果 + */ + public int insertEquOrderStandard(EquOrderStandard equOrderStandard); + + /** + * 修改计划工单-标准 + * + * @param equOrderStandard 计划工单-标准 + * @return 结果 + */ + public int updateEquOrderStandard(EquOrderStandard equOrderStandard); + + /** + * 删除计划工单-标准 + * + * @param id 计划工单-标准主键 + * @return 结果 + */ + public int deleteEquOrderStandardById(String id); + + /** + * 批量删除计划工单-标准 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquOrderStandardByIds(String[] ids); + + /** + * 通过parentCode查询信息 + * @param code + * @return + */ + List selectEquOrderStandardByParentCode(String code); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java index 5c9064602..b64356d3d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java @@ -1,6 +1,8 @@ package com.op.device.service; import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquOrder; /** @@ -13,10 +15,10 @@ public interface IEquOrderService { /** * 查询计划工单 * - * @param orderId 计划工单主键 + * @param orderCode 计划工单主键 * @return 计划工单 */ - public EquOrder selectEquOrderByOrderId(String orderId); + public EquOrder selectEquOrderByOrderCode(String orderCode); /** * 查询计划工单列表 @@ -32,7 +34,7 @@ public interface IEquOrderService { * @param equOrder 计划工单 * @return 结果 */ - public int insertEquOrder(EquOrder equOrder); + public AjaxResult insertEquOrder(EquOrder equOrder); /** * 修改计划工单 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index 9a42c032b..c9386e81a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -1,15 +1,23 @@ package com.op.device.service.impl; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOrderDetail; +import com.op.device.domain.EquOrderEqu; +import com.op.device.domain.EquOrderStandard; +import com.op.device.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.op.device.mapper.EquOrderMapper; import com.op.device.domain.EquOrder; import com.op.device.service.IEquOrderService; +import static com.op.common.core.web.domain.AjaxResult.success; + /** * 计划工单Service业务层处理 * @@ -20,17 +28,52 @@ import com.op.device.service.IEquOrderService; public class EquOrderServiceImpl implements IEquOrderService { @Autowired private EquOrderMapper equOrderMapper; + @Autowired + private EquOrderEquMapper equOrderEquMapper; + @Autowired + private EquOrderPersonMapper equOrderPersonMapper; + @Autowired + private EquOrderDetailMapper equOrderDetailMapper; + @Autowired + private EquOrderStandardMapper equOrderStandardMapper; /** * 查询计划工单 * - * @param orderId 计划工单主键 + * @param orderCode 计划工单主键 * @return 计划工单 */ @Override @DS("#header.poolName") - public EquOrder selectEquOrderByOrderId(String orderId) { - return equOrderMapper.selectEquOrderByOrderId(orderId); + public EquOrder selectEquOrderByOrderCode(String orderCode) { + // 查询工单信息 + EquOrder order = equOrderMapper.selectEquOrderByOrderCode(orderCode); + + List timeArray = new ArrayList<>(); + timeArray.add(order.getOrderStart()); + timeArray.add(order.getOrderEnd()); + order.setTimeArray(timeArray); + + order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(orderCode)); + + order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); + + List equList = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()); + + for (EquOrderEqu equ : equList) { + List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode()); + for (EquOrderDetail detail : detailList) { + List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); + detail.setStandardList(standardList); + } + equ.setDetailList(detailList); + } + + // TODO 人员信息 + + order.setEquList(equList); + + return order; } /** @@ -53,9 +96,11 @@ public class EquOrderServiceImpl implements IEquOrderService { */ @Override @DS("#header.poolName") - public int insertEquOrder(EquOrder equOrder) { + public AjaxResult insertEquOrder(EquOrder equOrder) { equOrder.setCreateTime(DateUtils.getNowDate()); - return equOrderMapper.insertEquOrder(equOrder); + // TODO 更新标准信息 + // TODO 更新工单信息 + return success(); } /** @@ -68,6 +113,10 @@ public class EquOrderServiceImpl implements IEquOrderService { @DS("#header.poolName") public int updateEquOrder(EquOrder equOrder) { equOrder.setUpdateTime(DateUtils.getNowDate()); + // TODO 更新标准信息 + // TODO 更新工单信息 + equOrder.setOrderStart(equOrder.getTimeArray().get(0)); + equOrder.setOrderEnd(equOrder.getTimeArray().get(1)); return equOrderMapper.updateEquOrder(equOrder); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml new file mode 100644 index 000000000..2ca628837 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, code, order_code, parent_code, item_code, item_name, item_method, item_type, item_type_name, factroy_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_detail + + + + + + + + + + insert into equ_order_detail + + id, + code, + order_code, + parent_code, + item_code, + item_name, + item_method, + item_type, + item_type_name, + factroy_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{orderCode}, + #{parentCode}, + #{itemCode}, + #{itemName}, + #{itemMethod}, + #{itemType}, + #{itemTypeName}, + #{factroyCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_order_detail + + code = #{code}, + order_code = #{orderCode}, + parent_code = #{parentCode}, + item_code = #{itemCode}, + item_name = #{itemName}, + item_method = #{itemMethod}, + item_type = #{itemType}, + item_type_name = #{itemTypeName}, + factroy_code = #{factroyCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_order_detail where id = #{id} + + + + delete from equ_order_detail where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml new file mode 100644 index 000000000..13a9e0d3c --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, code, parent_code, order_code, equipment_code, equipment_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_equ + + + + + + + + + + insert into equ_order_equ + + id, + code, + parent_code, + order_code, + equipment_code, + equipment_name, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{parentCode}, + #{orderCode}, + #{equipmentCode}, + #{equipmentName}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_order_equ + + code = #{code}, + parent_code = #{parentCode}, + order_code = #{orderCode}, + equipment_code = #{equipmentCode}, + equipment_name = #{equipmentName}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_order_equ where id = #{id} + + + + delete from equ_order_equ where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index f5e4491b7..255074a1d 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -72,9 +72,17 @@ - - where order_id = #{orderId} + where order_code = #{orderCode} + + + + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml new file mode 100644 index 000000000..de9ebcc19 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + select id, order_code, user_id, user_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_person + + + + + + + + insert into equ_order_person + + id, + order_code, + user_id, + user_name, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{orderCode}, + #{userId}, + #{userName}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_order_person + + order_code = #{orderCode}, + user_id = #{userId}, + user_name = #{userName}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_order_person where id = #{id} + + + + delete from equ_order_person where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml new file mode 100644 index 000000000..c7217926c --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_standard + + + + + + + + + + insert into equ_order_standard + + id, + code, + parent_code, + order_code, + standard_type, + standard_name, + detail_up_limit, + detail_down_limit, + detail_unit, + detail_reach, + actual_value, + detail_error, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{parentCode}, + #{orderCode}, + #{standardType}, + #{standardName}, + #{detailUpLimit}, + #{detailDownLimit}, + #{detailUnit}, + #{detailReach}, + #{actualValue}, + #{detailError}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_order_standard + + code = #{code}, + parent_code = #{parentCode}, + order_code = #{orderCode}, + standard_type = #{standardType}, + standard_name = #{standardName}, + detail_up_limit = #{detailUpLimit}, + detail_down_limit = #{detailDownLimit}, + detail_unit = #{detailUnit}, + detail_reach = #{detailReach}, + actual_value = #{actualValue}, + detail_error = #{detailError}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_order_standard where id = #{id} + + + + delete from equ_order_standard where id in + + #{id} + + + \ No newline at end of file