From 8e4a8bb12b794c834a836d38dc440658c82cd580 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 16 Oct 2023 13:56:59 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/EquPlanController.java | 97 +++++ .../java/com/op/device/domain/EquPlan.java | 362 ++++++++++++++++++ .../com/op/device/mapper/EquPlanMapper.java | 61 +++ .../op/device/service/IEquPlanService.java | 60 +++ .../service/impl/EquPlanServiceImpl.java | 114 ++++++ .../resources/mapper/device/EquPlanMapper.xml | 183 +++++++++ 6 files changed, 877 insertions(+) create mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java new file mode 100644 index 000000000..a03f50cc5 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -0,0 +1,97 @@ +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; +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.device.domain.EquPlan; +import com.op.device.service.IEquPlanService; +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 2023-10-16 + */ +@RestController +@RequestMapping("/plan") +public class EquPlanController extends BaseController { + @Autowired + private IEquPlanService equPlanService; + + /** + * 查询计划列表 + */ + @RequiresPermissions("device:plan:list") + @GetMapping("/list") + public TableDataInfo list(EquPlan equPlan) { + startPage(); + List list = equPlanService.selectEquPlanList(equPlan); + return getDataTable(list); + } + + /** + * 导出计划列表 + */ + @RequiresPermissions("device:plan:export") + @Log(title = "计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquPlan equPlan) { + List list = equPlanService.selectEquPlanList(equPlan); + ExcelUtil util = new ExcelUtil(EquPlan.class); + util.exportExcel(response, list, "计划数据"); + } + + /** + * 获取计划详细信息 + */ + @RequiresPermissions("device:plan:query") + @GetMapping(value = "/{planId}") + public AjaxResult getInfo(@PathVariable("planId") String planId) { + return success(equPlanService.selectEquPlanByPlanId(planId)); + } + + /** + * 新增计划 + */ + @RequiresPermissions("device:plan:add") + @Log(title = "计划", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquPlan equPlan) { + return toAjax(equPlanService.insertEquPlan(equPlan)); + } + + /** + * 修改计划 + */ + @RequiresPermissions("device:plan:edit") + @Log(title = "计划", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquPlan equPlan) { + return toAjax(equPlanService.updateEquPlan(equPlan)); + } + + /** + * 删除计划 + */ + @RequiresPermissions("device:plan:remove") + @Log(title = "计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{planIds}") + public AjaxResult remove(@PathVariable String[] planIds) { + return toAjax(equPlanService.deleteEquPlanByPlanIds(planIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java new file mode 100644 index 000000000..727018fa5 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java @@ -0,0 +1,362 @@ +package com.op.device.domain; + +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; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 计划对象 equ_plan + * + * @author Open Platform + * @date 2023-10-16 + */ +public class EquPlan extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String planId; + + /** 计划编码 */ + @Excel(name = "计划编码") + private String planCode; + + /** 计划名称 */ + @Excel(name = "计划名称") + private String planName; + + /** 车间 */ + @Excel(name = "车间") + private String planWorkshop; + + /** 产线 */ + @Excel(name = "产线") + private String planProdLine; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipmentName; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 循环周期 */ + @Excel(name = "循环周期") + private String planLoop; + + /** 循环周期类型 */ + @Excel(name = "循环周期类型") + private String planLoopType; + + /** 循环执行时间开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "循环执行时间开始", width = 30, dateFormat = "yyyy-MM-dd") + private Date planLoopStart; + + /** 循环执行时间结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "循环执行时间结束", width = 30, dateFormat = "yyyy-MM-dd") + private Date planLoopEnd; + + /** 巡检人员 */ + @Excel(name = "巡检人员") + private String planPerson; + + /** 计划状态 */ + @Excel(name = "计划状态") + private String planStatus; + + /** 是否可生产-限制 */ + @Excel(name = "是否可生产-限制") + private String planRestrict; + + /** 维护类型 */ + @Excel(name = "维护类型") + private String planType; + + /** 是否委外 */ + @Excel(name = "是否委外") + private String planOutsource; + + /** 委外工单编码 */ + @Excel(name = "委外工单编码") + private String workCode; + + /** 工厂 */ + @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; + + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getPlanId() { + return planId; + } + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getPlanCode() { + return planCode; + } + public void setPlanName(String planName) { + this.planName = planName; + } + + public String getPlanName() { + return planName; + } + public void setPlanWorkshop(String planWorkshop) { + this.planWorkshop = planWorkshop; + } + + public String getPlanWorkshop() { + return planWorkshop; + } + public void setPlanProdLine(String planProdLine) { + this.planProdLine = planProdLine; + } + + public String getPlanProdLine() { + return planProdLine; + } + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentName() { + return equipmentName; + } + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getEquipmentCode() { + return equipmentCode; + } + public void setPlanLoop(String planLoop) { + this.planLoop = planLoop; + } + + public String getPlanLoop() { + return planLoop; + } + public void setPlanLoopType(String planLoopType) { + this.planLoopType = planLoopType; + } + + public String getPlanLoopType() { + return planLoopType; + } + public void setPlanLoopStart(Date planLoopStart) { + this.planLoopStart = planLoopStart; + } + + public Date getPlanLoopStart() { + return planLoopStart; + } + public void setPlanLoopEnd(Date planLoopEnd) { + this.planLoopEnd = planLoopEnd; + } + + public Date getPlanLoopEnd() { + return planLoopEnd; + } + public void setPlanPerson(String planPerson) { + this.planPerson = planPerson; + } + + public String getPlanPerson() { + return planPerson; + } + public void setPlanStatus(String planStatus) { + this.planStatus = planStatus; + } + + public String getPlanStatus() { + return planStatus; + } + public void setPlanRestrict(String planRestrict) { + this.planRestrict = planRestrict; + } + + public String getPlanRestrict() { + return planRestrict; + } + public void setPlanType(String planType) { + this.planType = planType; + } + + public String getPlanType() { + return planType; + } + public void setPlanOutsource(String planOutsource) { + this.planOutsource = planOutsource; + } + + public String getPlanOutsource() { + return planOutsource; + } + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + + public String getWorkCode() { + return workCode; + } + 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("planId", getPlanId()) + .append("planCode", getPlanCode()) + .append("planName", getPlanName()) + .append("planWorkshop", getPlanWorkshop()) + .append("planProdLine", getPlanProdLine()) + .append("equipmentName", getEquipmentName()) + .append("equipmentCode", getEquipmentCode()) + .append("planLoop", getPlanLoop()) + .append("planLoopType", getPlanLoopType()) + .append("planLoopStart", getPlanLoopStart()) + .append("planLoopEnd", getPlanLoopEnd()) + .append("planPerson", getPlanPerson()) + .append("planStatus", getPlanStatus()) + .append("planRestrict", getPlanRestrict()) + .append("planType", getPlanType()) + .append("planOutsource", getPlanOutsource()) + .append("workCode", getWorkCode()) + .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/EquPlanMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java new file mode 100644 index 000000000..b6d5e50e0 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlan; + +/** + * 计划Mapper接口 + * + * @author Open Platform + * @date 2023-10-16 + */ +public interface EquPlanMapper { + /** + * 查询计划 + * + * @param planId 计划主键 + * @return 计划 + */ + public EquPlan selectEquPlanByPlanId(String planId); + + /** + * 查询计划列表 + * + * @param equPlan 计划 + * @return 计划集合 + */ + public List selectEquPlanList(EquPlan equPlan); + + /** + * 新增计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int insertEquPlan(EquPlan equPlan); + + /** + * 修改计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int updateEquPlan(EquPlan equPlan); + + /** + * 删除计划 + * + * @param planId 计划主键 + * @return 结果 + */ + public int deleteEquPlanByPlanId(String planId); + + /** + * 批量删除计划 + * + * @param planIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanByPlanIds(String[] planIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java new file mode 100644 index 000000000..24c603655 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.EquPlan; + +/** + * 计划Service接口 + * + * @author Open Platform + * @date 2023-10-16 + */ +public interface IEquPlanService { + /** + * 查询计划 + * + * @param planId 计划主键 + * @return 计划 + */ + public EquPlan selectEquPlanByPlanId(String planId); + + /** + * 查询计划列表 + * + * @param equPlan 计划 + * @return 计划集合 + */ + public List selectEquPlanList(EquPlan equPlan); + + /** + * 新增计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int insertEquPlan(EquPlan equPlan); + + /** + * 修改计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int updateEquPlan(EquPlan equPlan); + + /** + * 批量删除计划 + * + * @param planIds 需要删除的计划主键集合 + * @return 结果 + */ + public int deleteEquPlanByPlanIds(String[] planIds); + + /** + * 删除计划信息 + * + * @param planId 计划主键 + * @return 结果 + */ + public int deleteEquPlanByPlanId(String planId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java new file mode 100644 index 000000000..96afd6ec7 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -0,0 +1,114 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquPlanMapper; +import com.op.device.domain.EquPlan; +import com.op.device.service.IEquPlanService; + +/** + * 计划Service业务层处理 + * + * @author Open Platform + * @date 2023-10-16 + */ +@Service +public class EquPlanServiceImpl implements IEquPlanService { + @Autowired + private EquPlanMapper equPlanMapper; + + /** + * 查询计划 + * + * @param planId 计划主键 + * @return 计划 + */ + @Override + @DS("#header.poolName") + public EquPlan selectEquPlanByPlanId(String planId) { + return equPlanMapper.selectEquPlanByPlanId(planId); + } + + /** + * 查询计划列表 + * + * @param equPlan 计划 + * @return 计划 + */ + @Override + @DS("#header.poolName") + public List selectEquPlanList(EquPlan equPlan) { + if (equPlan.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equPlan.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equPlan.setCreateTimeStart(formatter.format(equPlan.getCreateTimeArray().get(0))); + equPlan.setCreateTimeEnd(formatter.format(equPlan.getCreateTimeArray().get(1))); + } + } + if (equPlan.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equPlan.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equPlan.setUpdateTimeStart(formatter.format(equPlan.getUpdateTimeArray().get(0))); + equPlan.setUpdateTimeEnd(formatter.format(equPlan.getUpdateTimeArray().get(1))); + } + } + return equPlanMapper.selectEquPlanList(equPlan); + } + + /** + * 新增计划 + * + * @param equPlan 计划 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertEquPlan(EquPlan equPlan) { + equPlan.setCreateTime(DateUtils.getNowDate()); + return equPlanMapper.insertEquPlan(equPlan); + } + + /** + * 修改计划 + * + * @param equPlan 计划 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquPlan(EquPlan equPlan) { + equPlan.setUpdateTime(DateUtils.getNowDate()); + return equPlanMapper.updateEquPlan(equPlan); + } + + /** + * 批量删除计划 + * + * @param planIds 需要删除的计划主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquPlanByPlanIds(String[] planIds) { + return equPlanMapper.deleteEquPlanByPlanIds(planIds); + } + + /** + * 删除计划信息 + * + * @param planId 计划主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquPlanByPlanId(String planId) { + return equPlanMapper.deleteEquPlanByPlanId(planId); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml new file mode 100644 index 000000000..f42a047b5 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select plan_id, plan_code, plan_name, plan_workshop, plan_prod_line, equipment_name, equipment_code, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, plan_person, plan_status, plan_restrict, plan_type, plan_outsource, work_code, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan + + + + + + + + insert into equ_plan + + plan_id, + plan_code, + plan_name, + plan_workshop, + plan_prod_line, + equipment_name, + equipment_code, + plan_loop, + plan_loop_type, + plan_loop_start, + plan_loop_end, + plan_person, + plan_status, + plan_restrict, + plan_type, + plan_outsource, + work_code, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{planId}, + #{planCode}, + #{planName}, + #{planWorkshop}, + #{planProdLine}, + #{equipmentName}, + #{equipmentCode}, + #{planLoop}, + #{planLoopType}, + #{planLoopStart}, + #{planLoopEnd}, + #{planPerson}, + #{planStatus}, + #{planRestrict}, + #{planType}, + #{planOutsource}, + #{workCode}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan + + plan_code = #{planCode}, + plan_name = #{planName}, + plan_workshop = #{planWorkshop}, + plan_prod_line = #{planProdLine}, + equipment_name = #{equipmentName}, + equipment_code = #{equipmentCode}, + plan_loop = #{planLoop}, + plan_loop_type = #{planLoopType}, + plan_loop_start = #{planLoopStart}, + plan_loop_end = #{planLoopEnd}, + plan_person = #{planPerson}, + plan_status = #{planStatus}, + plan_restrict = #{planRestrict}, + plan_type = #{planType}, + plan_outsource = #{planOutsource}, + work_code = #{workCode}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + and CONVERT(date,create_time) >= #{createTimeStart} + and #{createTimeEnd} >= CONVERT(date,create_time) + and create_by like concat('%', #{createBy}, '%') + and CONVERT(date,update_time) >= #{updateTimeStart} + and #{updateTimeEnd} >= CONVERT(date,update_time) + and update_by like concat('%', #{updateBy}, '%') + and del_flag = '0' + + where plan_id = #{planId} + + + + delete from equ_plan where plan_id = #{planId} + + + + delete from equ_plan where plan_id in + + #{planId} + + + \ No newline at end of file From 497e14c9653c20944b043d9e61a32514619b715a Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 16 Oct 2023 14:13:48 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsOdsMateStorageNewsController.java | 97 +++ .../device/domain/WmsOdsMateStorageNews.java | 568 ++++++++++++++++++ .../mapper/WmsOdsMateStorageNewsMapper.java | 61 ++ .../IWmsOdsMateStorageNewsService.java | 60 ++ .../WmsOdsMateStorageNewsServiceImpl.java | 95 +++ .../device/WmsOdsMateStorageNewsMapper.xml | 258 ++++++++ 6 files changed, 1139 insertions(+) create mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/WmsOdsMateStorageNews.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java b/op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java new file mode 100644 index 000000000..16841303e --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java @@ -0,0 +1,97 @@ +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; +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.device.domain.WmsOdsMateStorageNews; +import com.op.device.service.IWmsOdsMateStorageNewsService; +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 2023-10-13 + */ +@RestController +@RequestMapping("/sparePartsLedger") +public class WmsOdsMateStorageNewsController extends BaseController { + @Autowired + private IWmsOdsMateStorageNewsService wmsOdsMateStorageNewsService; + + /** + * 查询备品备件台账管理列表 + */ + @RequiresPermissions("device:sparePartsLedger:list") + @GetMapping("/list") + public TableDataInfo list(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + startPage(); + List list = wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); + return getDataTable(list); + } + + /** + * 导出备品备件台账管理列表 + */ + @RequiresPermissions("device:sparePartsLedger:export") + @Log(title = "备品备件台账管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsOdsMateStorageNews wmsOdsMateStorageNews) { + List list = wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); + ExcelUtil util = new ExcelUtil(WmsOdsMateStorageNews.class); + util.exportExcel(response, list, "备品备件台账管理数据"); + } + + /** + * 获取备品备件台账管理详细信息 + */ + @RequiresPermissions("device:sparePartsLedger:query") + @GetMapping(value = "/{storageId}") + public AjaxResult getInfo(@PathVariable("storageId") String storageId) { + return success(wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsByStorageId(storageId)); + } + + /** + * 新增备品备件台账管理 + */ + @RequiresPermissions("device:sparePartsLedger:add") + @Log(title = "备品备件台账管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmsOdsMateStorageNews wmsOdsMateStorageNews) { + return toAjax(wmsOdsMateStorageNewsService.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews)); + } + + /** + * 修改备品备件台账管理 + */ + @RequiresPermissions("device:sparePartsLedger:edit") + @Log(title = "备品备件台账管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsOdsMateStorageNews wmsOdsMateStorageNews) { + return toAjax(wmsOdsMateStorageNewsService.updateWmsOdsMateStorageNews(wmsOdsMateStorageNews)); + } + + /** + * 删除备品备件台账管理 + */ + @RequiresPermissions("device:sparePartsLedger:remove") + @Log(title = "备品备件台账管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{storageIds}") + public AjaxResult remove(@PathVariable String[] storageIds) { + return toAjax(wmsOdsMateStorageNewsService.deleteWmsOdsMateStorageNewsByStorageIds(storageIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/WmsOdsMateStorageNews.java b/op-modules/op-device/src/main/java/com/op/device/domain/WmsOdsMateStorageNews.java new file mode 100644 index 000000000..f95271c09 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/WmsOdsMateStorageNews.java @@ -0,0 +1,568 @@ +package com.op.device.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +/** + * 备品备件台账管理对象 wms_ods_mate_storage_news + * + * @author Open Platform + * @date 2023-10-13 + */ +public class WmsOdsMateStorageNews extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 唯一序列 */ + @Excel(name = "唯一序列") + private String storageId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String whCode; + + /** 区域编号 */ + @Excel(name = "区域编号") + private String regionCode; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String waCode; + + /** 库存类型：BC－包材 */ + @Excel(name = "库存类型：BC－包材") + private String storageType; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String wlCode; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDesc; + + /** 总数量 */ + @Excel(name = "总数量") + private BigDecimal amount; + + /** 冻结数量（预留） */ + @Excel(name = "冻结数量", readConverterExp = "预=留") + private BigDecimal storageAmount; + + /** 占用数量 */ + @Excel(name = "占用数量") + private BigDecimal occupyAmount; + + /** LPN（预留） */ + @Excel(name = "LPN", readConverterExp = "预=留") + private String lpn; + + /** 入库批次号（预留） */ + @Excel(name = "入库批次号", readConverterExp = "预=留") + private String productBatch; + + /** 入库时间x（预留） */ + @Excel(name = "入库时间x", readConverterExp = "预=留") + private Date receiveDate; + + /** 生产时间（预留） */ + @Excel(name = "生产时间", readConverterExp = "预=留") + private Date productDate; + + /** 单位 */ + @Excel(name = "单位") + private String userDefined1; + + /** SAP库位 */ + @Excel(name = "SAP库位") + private String userDefined2; + + /** 备用3 */ + @Excel(name = "备用3") + private String userDefined3; + + /** 备用4 */ + @Excel(name = "备用4") + private String userDefined4; + + /** 备用5 */ + @Excel(name = "备用5") + private String userDefined5; + + /** 备用6 */ + @Excel(name = "备用6") + private String userDefined6; + + /** 备用7 */ + @Excel(name = "备用7") + private String userDefined7; + + /** 备用8 */ + @Excel(name = "备用8") + private String userDefined8; + + /** 备用9 */ + @Excel(name = "备用9") + private String userDefined9; + + /** 备用10 */ + @Excel(name = "备用10") + private String userDefined10; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtCreate; + + /** 最后更新人 */ + @Excel(name = "最后更新人") + private String lastModifiedBy; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtModified; + + /** 有效标记 */ + @Excel(name = "有效标记") + private String activeFlag; + + /** 工厂号 */ + @Excel(name = "工厂号") + private String factoryCode; + + /** SAP工厂号 */ + @Excel(name = "SAP工厂号") + private String sapFactoryCode; + + /** 库位名称 */ + @Excel(name = "库位名称") + private String wlName; + + /** 0存在 */ + private String delFlag; + + /** 使用寿命（备件用） */ + @Excel(name = "使用寿命", readConverterExp = "备=件用") + private String spareUseLife; + + /** 备件名称（备件用） */ + @Excel(name = "备件名称", readConverterExp = "备=件用") + private String spareName; + + /** 规格型号（备件用） */ + @Excel(name = "规格型号", readConverterExp = "备=件用") + private String spareMode; + + /** 生产厂商（备件用） */ + @Excel(name = "生产厂商", readConverterExp = "备=件用") + private String spareManufacturer; + + /** 供应商（备件用） */ + @Excel(name = "供应商", readConverterExp = "备=件用") + private String spareSupplier; + + /** 循环周期（备件用） */ + @Excel(name = "循环周期", readConverterExp = "备=件用") + private String spareReplacementCycle; + + /** 计量单位（备件用） */ + @Excel(name = "计量单位", readConverterExp = "备=件用") + private String spareMeasurementUnit; + + /** 换算单位（备件用） */ + @Excel(name = "换算单位", readConverterExp = "备=件用") + private String spareConversionUnit; + + /** 换算比例（备件用） */ + @Excel(name = "换算比例", readConverterExp = "备=件用") + private String spareConversionRatio; + + /** 库存上限（备件用） */ + @Excel(name = "库存上限", readConverterExp = "备=件用") + private String spareInventoryFloor; + + /** 库存下限（备件用） */ + @Excel(name = "库存下限", readConverterExp = "备=件用") + private String spareInventoryUpper; + + /** 备件类型 */ + @Excel(name = "备件类型", readConverterExp = "备=件用") + private String spareType; + + public void setSpareType(String spareType) { + this.spareType = spareType; + } + + public String getSpareType() { + return spareType; + } + + public void setStorageId(String storageId) { + this.storageId = storageId; + } + + public String getStorageId() { + return storageId; + } + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public String getRegionCode() { + return regionCode; + } + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + public void setStorageType(String storageType) { + this.storageType = storageType; + } + + public String getStorageType() { + return storageType; + } + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialDesc(String materialDesc) { + this.materialDesc = materialDesc; + } + + public String getMaterialDesc() { + return materialDesc; + } + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getAmount() { + return amount; + } + public void setStorageAmount(BigDecimal storageAmount) { + this.storageAmount = storageAmount; + } + + public BigDecimal getStorageAmount() { + return storageAmount; + } + public void setOccupyAmount(BigDecimal occupyAmount) { + this.occupyAmount = occupyAmount; + } + + public BigDecimal getOccupyAmount() { + return occupyAmount; + } + public void setLpn(String lpn) { + this.lpn = lpn; + } + + public String getLpn() { + return lpn; + } + public void setProductBatch(String productBatch) { + this.productBatch = productBatch; + } + + public String getProductBatch() { + return productBatch; + } + public void setReceiveDate(Date receiveDate) { + this.receiveDate = receiveDate; + } + + public Date getReceiveDate() { + return receiveDate; + } + public void setProductDate(Date productDate) { + this.productDate = productDate; + } + + public Date getProductDate() { + return productDate; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + public void setUserDefined6(String userDefined6) { + this.userDefined6 = userDefined6; + } + + public String getUserDefined6() { + return userDefined6; + } + public void setUserDefined7(String userDefined7) { + this.userDefined7 = userDefined7; + } + + public String getUserDefined7() { + return userDefined7; + } + public void setUserDefined8(String userDefined8) { + this.userDefined8 = userDefined8; + } + + public String getUserDefined8() { + return userDefined8; + } + public void setUserDefined9(String userDefined9) { + this.userDefined9 = userDefined9; + } + + public String getUserDefined9() { + return userDefined9; + } + public void setUserDefined10(String userDefined10) { + this.userDefined10 = userDefined10; + } + + public String getUserDefined10() { + return userDefined10; + } + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public Date getGmtCreate() { + return gmtCreate; + } + public void setLastModifiedBy(String lastModifiedBy) { + this.lastModifiedBy = lastModifiedBy; + } + + public String getLastModifiedBy() { + return lastModifiedBy; + } + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + public Date getGmtModified() { + return gmtModified; + } + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setSapFactoryCode(String sapFactoryCode) { + this.sapFactoryCode = sapFactoryCode; + } + + public String getSapFactoryCode() { + return sapFactoryCode; + } + public void setWlName(String wlName) { + this.wlName = wlName; + } + + public String getWlName() { + return wlName; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + public void setSpareUseLife(String spareUseLife) { + this.spareUseLife = spareUseLife; + } + + public String getSpareUseLife() { + return spareUseLife; + } + public void setSpareName(String spareName) { + this.spareName = spareName; + } + + public String getSpareName() { + return spareName; + } + public void setSpareMode(String spareMode) { + this.spareMode = spareMode; + } + + public String getSpareMode() { + return spareMode; + } + public void setSpareManufacturer(String spareManufacturer) { + this.spareManufacturer = spareManufacturer; + } + + public String getSpareManufacturer() { + return spareManufacturer; + } + public void setSpareSupplier(String spareSupplier) { + this.spareSupplier = spareSupplier; + } + + public String getSpareSupplier() { + return spareSupplier; + } + public void setSpareReplacementCycle(String spareReplacementCycle) { + this.spareReplacementCycle = spareReplacementCycle; + } + + public String getSpareReplacementCycle() { + return spareReplacementCycle; + } + public void setSpareMeasurementUnit(String spareMeasurementUnit) { + this.spareMeasurementUnit = spareMeasurementUnit; + } + + public String getSpareMeasurementUnit() { + return spareMeasurementUnit; + } + public void setSpareConversionUnit(String spareConversionUnit) { + this.spareConversionUnit = spareConversionUnit; + } + + public String getSpareConversionUnit() { + return spareConversionUnit; + } + public void setSpareConversionRatio(String spareConversionRatio) { + this.spareConversionRatio = spareConversionRatio; + } + + public String getSpareConversionRatio() { + return spareConversionRatio; + } + public void setSpareInventoryFloor(String spareInventoryFloor) { + this.spareInventoryFloor = spareInventoryFloor; + } + + public String getSpareInventoryFloor() { + return spareInventoryFloor; + } + public void setSpareInventoryUpper(String spareInventoryUpper) { + this.spareInventoryUpper = spareInventoryUpper; + } + + public String getSpareInventoryUpper() { + return spareInventoryUpper; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("storageId", getStorageId()) + .append("whCode", getWhCode()) + .append("regionCode", getRegionCode()) + .append("waCode", getWaCode()) + .append("storageType", getStorageType()) + .append("wlCode", getWlCode()) + .append("materialCode", getMaterialCode()) + .append("materialDesc", getMaterialDesc()) + .append("amount", getAmount()) + .append("storageAmount", getStorageAmount()) + .append("occupyAmount", getOccupyAmount()) + .append("lpn", getLpn()) + .append("productBatch", getProductBatch()) + .append("receiveDate", getReceiveDate()) + .append("productDate", getProductDate()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .append("userDefined6", getUserDefined6()) + .append("userDefined7", getUserDefined7()) + .append("userDefined8", getUserDefined8()) + .append("userDefined9", getUserDefined9()) + .append("userDefined10", getUserDefined10()) + .append("createBy", getCreateBy()) + .append("gmtCreate", getGmtCreate()) + .append("lastModifiedBy", getLastModifiedBy()) + .append("gmtModified", getGmtModified()) + .append("activeFlag", getActiveFlag()) + .append("factoryCode", getFactoryCode()) + .append("sapFactoryCode", getSapFactoryCode()) + .append("wlName", getWlName()) + .append("delFlag", getDelFlag()) + .append("spareUseLife", getSpareUseLife()) + .append("spareName", getSpareName()) + .append("spareMode", getSpareMode()) + .append("spareManufacturer", getSpareManufacturer()) + .append("spareSupplier", getSpareSupplier()) + .append("spareReplacementCycle", getSpareReplacementCycle()) + .append("spareMeasurementUnit", getSpareMeasurementUnit()) + .append("spareConversionUnit", getSpareConversionUnit()) + .append("spareConversionRatio", getSpareConversionRatio()) + .append("spareInventoryFloor", getSpareInventoryFloor()) + .append("spareInventoryUpper", getSpareInventoryUpper()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java new file mode 100644 index 000000000..cafa5899b --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.WmsOdsMateStorageNews; + +/** + * 备品备件台账管理Mapper接口 + * + * @author Open Platform + * @date 2023-10-13 + */ +public interface WmsOdsMateStorageNewsMapper { + /** + * 查询备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 备品备件台账管理 + */ + public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId); + + /** + * 查询备品备件台账管理列表 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 备品备件台账管理集合 + */ + public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + /** + * 新增备品备件台账管理 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 结果 + */ + public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + /** + * 修改备品备件台账管理 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 结果 + */ + public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + /** + * 删除备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 结果 + */ + public int deleteWmsOdsMateStorageNewsByStorageId(String storageId); + + /** + * 批量删除备品备件台账管理 + * + * @param storageIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java b/op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java new file mode 100644 index 000000000..1330881fb --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.WmsOdsMateStorageNews; + +/** + * 备品备件台账管理Service接口 + * + * @author Open Platform + * @date 2023-10-13 + */ +public interface IWmsOdsMateStorageNewsService { + /** + * 查询备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 备品备件台账管理 + */ + public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId); + + /** + * 查询备品备件台账管理列表 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 备品备件台账管理集合 + */ + public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + /** + * 新增备品备件台账管理 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 结果 + */ + public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + /** + * 修改备品备件台账管理 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 结果 + */ + public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + /** + * 批量删除备品备件台账管理 + * + * @param storageIds 需要删除的备品备件台账管理主键集合 + * @return 结果 + */ + public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds); + + /** + * 删除备品备件台账管理信息 + * + * @param storageId 备品备件台账管理主键 + * @return 结果 + */ + public int deleteWmsOdsMateStorageNewsByStorageId(String storageId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java new file mode 100644 index 000000000..af7c4c868 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java @@ -0,0 +1,95 @@ +package com.op.device.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.WmsOdsMateStorageNewsMapper; +import com.op.device.domain.WmsOdsMateStorageNews; +import com.op.device.service.IWmsOdsMateStorageNewsService; + +/** + * 备品备件台账管理Service业务层处理 + * + * @author Open Platform + * @date 2023-10-13 + */ +@Service +public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsService { + @Autowired + private WmsOdsMateStorageNewsMapper wmsOdsMateStorageNewsMapper; + + /** + * 查询备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 备品备件台账管理 + */ + @Override + @DS("#header.poolName") + public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId) { + return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsByStorageId(storageId); + } + + /** + * 查询备品备件台账管理列表 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 备品备件台账管理 + */ + @Override + @DS("#header.poolName") + public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + wmsOdsMateStorageNews.setStorageType("SP"); + return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); + } + + /** + * 新增备品备件台账管理 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + return wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews); + } + + /** + * 修改备品备件台账管理 + * + * @param wmsOdsMateStorageNews 备品备件台账管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + return wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNews(wmsOdsMateStorageNews); + } + + /** + * 批量删除备品备件台账管理 + * + * @param storageIds 需要删除的备品备件台账管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds) { + return wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsByStorageIds(storageIds); + } + + /** + * 删除备品备件台账管理信息 + * + * @param storageId 备品备件台账管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteWmsOdsMateStorageNewsByStorageId(String storageId) { + return wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsByStorageId(storageId); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml new file mode 100644 index 000000000..c402c2fb0 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select storage_type, material_code, material_desc, amount,sap_factory_code, wl_name, del_flag, spare_use_life, spare_name, spare_mode, spare_manufacturer, spare_supplier, spare_replacement_cycle, spare_measurement_unit, spare_conversion_unit, spare_conversion_ratio, spare_inventory_floor, spare_inventory_upper,spare_type,create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code from wms_ods_mate_storage_news + + + + + + + + insert into wms_ods_mate_storage_news + + storage_id, + wh_code, + region_code, + wa_code, + storage_type, + wl_code, + material_code, + material_desc, + amount, + storage_amount, + occupy_amount, + lpn, + product_batch, + receive_date, + product_date, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + user_defined6, + user_defined7, + user_defined8, + user_defined9, + user_defined10, + create_by, + gmt_create, + last_modified_by, + gmt_modified, + active_flag, + factory_code, + sap_factory_code, + wl_name, + del_flag, + spare_use_life, + spare_name, + spare_mode, + spare_manufacturer, + spare_supplier, + spare_replacement_cycle, + spare_measurement_unit, + spare_conversion_unit, + spare_conversion_ratio, + spare_inventory_floor, + spare_inventory_upper, + spare_type, + + + #{storageId}, + #{whCode}, + #{regionCode}, + #{waCode}, + #{storageType}, + #{wlCode}, + #{materialCode}, + #{materialDesc}, + #{amount}, + #{storageAmount}, + #{occupyAmount}, + #{lpn}, + #{productBatch}, + #{receiveDate}, + #{productDate}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{createBy}, + #{gmtCreate}, + #{lastModifiedBy}, + #{gmtModified}, + #{activeFlag}, + #{factoryCode}, + #{sapFactoryCode}, + #{wlName}, + #{delFlag}, + #{spareUseLife}, + #{spareName}, + #{spareMode}, + #{spareManufacturer}, + #{spareSupplier}, + #{spareReplacementCycle}, + #{spareMeasurementUnit}, + #{spareConversionUnit}, + #{spareConversionRatio}, + #{spareInventoryFloor}, + #{spareInventoryUpper}, + #{spareType}, + + + + + update wms_ods_mate_storage_news + + wh_code = #{whCode}, + region_code = #{regionCode}, + wa_code = #{waCode}, + storage_type = #{storageType}, + wl_code = #{wlCode}, + material_code = #{materialCode}, + material_desc = #{materialDesc}, + amount = #{amount}, + storage_amount = #{storageAmount}, + occupy_amount = #{occupyAmount}, + lpn = #{lpn}, + product_batch = #{productBatch}, + receive_date = #{receiveDate}, + product_date = #{productDate}, + user_defined1 = #{userDefined1}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + user_defined6 = #{userDefined6}, + user_defined7 = #{userDefined7}, + user_defined8 = #{userDefined8}, + user_defined9 = #{userDefined9}, + user_defined10 = #{userDefined10}, + create_by = #{createBy}, + gmt_create = #{gmtCreate}, + last_modified_by = #{lastModifiedBy}, + gmt_modified = #{gmtModified}, + active_flag = #{activeFlag}, + factory_code = #{factoryCode}, + sap_factory_code = #{sapFactoryCode}, + wl_name = #{wlName}, + del_flag = #{delFlag}, + spare_use_life = #{spareUseLife}, + spare_name = #{spareName}, + spare_mode = #{spareMode}, + spare_manufacturer = #{spareManufacturer}, + spare_supplier = #{spareSupplier}, + spare_replacement_cycle = #{spareReplacementCycle}, + spare_measurement_unit = #{spareMeasurementUnit}, + spare_conversion_unit = #{spareConversionUnit}, + spare_conversion_ratio = #{spareConversionRatio}, + spare_inventory_floor = #{spareInventoryFloor}, + spare_inventory_upper = #{spareInventoryUpper}, + spare_type = #{spareType}, + + where storage_id = #{storageId} + + + + delete from wms_ods_mate_storage_news where storage_id = #{storageId} + + + + delete from wms_ods_mate_storage_news where storage_id in + + #{storageId} + + + \ No newline at end of file From d4ce34c3325eb695b990fffb2785030f17d59437 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 16 Oct 2023 17:01:37 +0800 Subject: [PATCH 03/13] =?UTF-8?q?1=E3=80=81=E7=9C=8B=E6=9D=BF=E6=96=99?= =?UTF-8?q?=E7=BD=90=E8=BD=A6=E6=95=B0=E8=8E=B7=E5=8F=96=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E5=B0=8F=E6=97=B6=E4=BA=A7=E9=87=8F=E5=8A=A0=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E3=80=81=E5=88=86=E9=92=9F=E6=95=B0=E5=81=9A=E6=B4=BB?= =?UTF-8?q?,=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=9B3=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=AE=8C=E6=88=90=E8=AE=B0=E5=BD=95=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=8F=AD=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/common/core/domain/ExcelCol.java | 49 ++++++++ .../common/core/utils/poi/ExcelMapUtil.java | 118 ++++++++++++++++++ .../controller/MesReportWorkController.java | 77 ++++++++++-- .../controller/WCSInterfaceController.java | 2 +- .../java/com/op/mes/domain/MesHourReport.java | 9 ++ .../com/op/mes/domain/MesProcessReport.java | 9 ++ .../main/java/com/op/mes/domain/MesShift.java | 39 ++++++ .../op/mes/mapper/MesReportWorkMapper.java | 2 + .../op/mes/service/IMesReportWorkService.java | 2 + .../service/impl/IWCInterfaceServiceImpl.java | 3 +- .../impl/MesReportWorkServiceImpl.java | 10 ++ .../main/resources/mapper/mes/MesMapper.xml | 20 +-- .../mapper/mes/MesReportWorkMapper.xml | 14 ++- 13 files changed, 333 insertions(+), 21 deletions(-) create mode 100644 op-common/op-common-core/src/main/java/com/op/common/core/domain/ExcelCol.java create mode 100644 op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/MesShift.java diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/domain/ExcelCol.java b/op-common/op-common-core/src/main/java/com/op/common/core/domain/ExcelCol.java new file mode 100644 index 000000000..b9087a38f --- /dev/null +++ b/op-common/op-common-core/src/main/java/com/op/common/core/domain/ExcelCol.java @@ -0,0 +1,49 @@ +package com.op.common.core.domain; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 附件对象 base_file + * + * @author Open Platform + * @date 2023-07-10 + */ +public class ExcelCol extends BaseEntity { + private static final long serialVersionUID = 1L; + private String title;//表头名称 + private String field;//内容名称(与数据库传回的参数字段对应) + private int width;//单元格宽度 + + public ExcelCol(String title, String field, int width) { + this.title = title; + this.field = field; + this.width = width; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getField() { + return field; + } + + public void setField(String field) { + this.field = field; + } + + public int getWidth() { + return width; + } + + public void setWidth(int width) { + this.width = width; + } +} diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java new file mode 100644 index 000000000..62af95270 --- /dev/null +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java @@ -0,0 +1,118 @@ +package com.op.common.core.utils.poi; + +import com.alibaba.fastjson2.JSONObject; +import com.op.common.core.domain.ExcelCol; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +/** + * Excel相关处理 + * + * @author OP + */ +public class ExcelMapUtil { + //下载 + public static SXSSFWorkbook initWorkbook(String sheetName , String title , List excelCol , List data){ + SXSSFWorkbook workbook = new SXSSFWorkbook(); + int colSize = excelCol.size(); + + //创建Sheet（工作簿） + Sheet sheet = null; + if (!StringUtils.hasText(sheetName)){ + sheet = workbook.createSheet(); + }else{ + sheet = workbook.createSheet(sheetName); + } +// //创建主标题行(第一行) +// Row sheetTitleRow = sheet.createRow(0); +// Cell titleCell = sheetTitleRow.createCell(0);//创建第一行第一个单元格 +// titleCell.setCellValue(title);//传值 +// titleCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式 +// //主标题行合并单元格 +// CellRangeAddress cellAddresses = new CellRangeAddress(0, 0, 0, colSize - 1); +// sheet.addMergedRegion(cellAddresses); + //创建表头行（第二行） + Row sheetHeadRow = sheet.createRow(0);//1 + //遍历表头名称，创建表头单元格 + for(int i = 0 ; i < colSize ; i++){ + sheet.setColumnWidth(i,(excelCol.get(i).getWidth())*256);//宽度单位是字符的256分之一 + Cell headCell = sheetHeadRow.createCell(i); + headCell.setCellValue(excelCol.get(i).getTitle());//传值 + headCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式 + } + + //将data中的值填充到excel + int rowNum = sheet.getLastRowNum()+1; + Iterator iterator = data.iterator(); + //遍历数据 + for (;iterator.hasNext();){ + Row dataRow = sheet.createRow(rowNum);//创建行 + T obj = iterator.next();//获取当前行对应的数据 + JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj)); + for (int i = 0 ; i < colSize ; i++ ){ + Cell dataCell = dataRow.createCell(i); + dataCell.setCellStyle(getDataFont(workbook)); + if(i>=2){ + dataCell.setCellValue(getValueNum(jsonObject.get(excelCol.get(i).getField()))); + }else{ + dataCell.setCellValue(getValue(jsonObject.get(excelCol.get(i).getField()))); + } + + } + iterator.remove(); + rowNum++; + } + return workbook; + } + + //标题样式 + public static CellStyle getHeaderFont(Workbook workbook){ + Font font = workbook.createFont(); + font.setFontHeightInPoints((short) 16);//字体大小 + font.setBold(true);//加粗 + CellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setFont(font); + cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中 + return cellStyle; + } + + //内容样式 + public static CellStyle getDataFont(Workbook workbook){ + Font font = workbook.createFont(); + font.setFontHeightInPoints((short) 12);//字体大小 + font.setBold(false);//不加粗 + CellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setFont(font); + cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中 + return cellStyle; + } + + //处理数据 + public static String getValue(Object object){ + if (object==null){ + return ""; + }else { + return object.toString(); + } + } + //处理数据 + public static Integer getValueNum(Object object){ + if (object==null){ + return 0; + }else { + return Integer.parseInt(object.toString()); + } + } +} 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 716b708b3..8b5c90ace 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 @@ -4,18 +4,19 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; - +import com.op.common.core.domain.ExcelCol; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.poi.ExcelMapUtil; import com.op.common.core.utils.uuid.IdUtils; import com.op.mes.domain.*; import com.op.mes.domain.dto.LineChartDto; import com.op.mes.domain.dto.SysFactoryDto; -import com.op.mes.mapper.MesReportWorkMapper; import org.apache.commons.lang.StringUtils; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -196,7 +197,7 @@ public class MesReportWorkController extends BaseController { */ @RequiresPermissions("mes:hourProduction:list") @GetMapping("/getHourProductionTitle") - public List getProcessFinishList(MesHourReport mesHourReport) { + public List getHourProductionTitle(MesHourReport mesHourReport) { //默认时间范围T 00:00:00~T+1 00:00:00 if(StringUtils.isEmpty(mesHourReport.getProductDateStart())){ mesHourReport.setProductDateStart(DateUtils.getDate()+" 00:00:00");//start @@ -210,8 +211,20 @@ public class MesReportWorkController extends BaseController { List dayHours = new ArrayList(); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH"); try { - Date start = dateFormat.parse(mesHourReport.getProductDateStart()); - Date end = dateFormat.parse(mesHourReport.getProductDateEnd()); + + Date start = dateFormat.parse(mesHourReport.getProductDateStart());//开始 + Date end = dateFormat.parse(mesHourReport.getProductDateEnd());//结束 + + //如果有分钟数，默认加一小时 + String endTimeStr1 = mesHourReport.getProductDateEnd(); + String[] endTime2 = endTimeStr1.split(" "); + String endTime3 = endTime2[1].split(":")[1]; + if(Integer.parseInt(endTime3)!=0){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(end); + calendar.add(Calendar.HOUR_OF_DAY, 1); + end = calendar.getTime(); + } Calendar tempStart = Calendar.getInstance(); tempStart.setTime(start); @@ -228,18 +241,68 @@ public class MesReportWorkController extends BaseController { return dayHours; } + + /** + * 获取班次信息list + * + * @return + */ + @GetMapping("/getProShifts") + public AjaxResult getProShifts() { + return success(mesReportWorkService.getProShifts()); + } + /** * 小时产量数据体 */ @RequiresPermissions("mes:hourProduction:list") @GetMapping("/getHourProductionList") public List getHourProductionList(MesHourReport mesHourReport) { - List hourNames = this.getProcessFinishList(mesHourReport); + List hourNames = this.getHourProductionTitle(mesHourReport); mesHourReport.setHourNames(hourNames); List list = mesReportWorkService.getHourProductionList(mesHourReport); return list; } + @RequiresPermissions("mes:hourProduction:list") + @PostMapping("/getHourProductionExport") + public void getHourProductionExport(HttpServletResponse response,MesHourReport mesHourReport) { + List hourNames = this.getHourProductionTitle(mesHourReport); + mesHourReport.setHourNames(hourNames); + List list = mesReportWorkService.getHourProductionList(mesHourReport); + + //表格结构数据 + String title = "表主标题"; + ArrayList excelCols = new ArrayList<>(); + excelCols.add(new ExcelCol("设备编码","equCode",20)); + excelCols.add(new ExcelCol("设备名称","equName",20)); + excelCols.add(new ExcelCol("设备总产量","quantity",20)); + + for(int n = 0;n lgdtos) { if(CollectionUtils.isEmpty(lgdtos)){ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesHourReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesHourReport.java index 9a5d0750f..4fb23bdad 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesHourReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesHourReport.java @@ -28,6 +28,15 @@ public class MesHourReport extends BaseEntity { private String workorderCode; private List hourNames; private String equCodeHour; + private String shiftId; + + public String getShiftId() { + return shiftId; + } + + public void setShiftId(String shiftId) { + this.shiftId = shiftId; + } public String getEquCodeHour() { return equCodeHour; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProcessReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProcessReport.java index 56edadb9d..ab8e26ee3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProcessReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProcessReport.java @@ -46,6 +46,15 @@ public class MesProcessReport extends BaseEntity { private String unit; private String productDateStart; private String productDateEnd; + private String shiftId; + + public String getShiftId() { + return shiftId; + } + + public void setShiftId(String shiftId) { + this.shiftId = shiftId; + } public String getEquCode() { return equCode; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesShift.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesShift.java new file mode 100644 index 000000000..f10d83539 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesShift.java @@ -0,0 +1,39 @@ +package com.op.mes.domain; + +//班次实体类 +public class MesShift { + private Integer shiftId; + private String shiftDesc; + + @Override + public String toString() { + return "ProShift{" + + "shiftId=" + shiftId + + ", shiftDesc='" + shiftDesc + '\'' + + '}'; + } + + public Integer getShiftId() { + return shiftId; + } + + public void setShiftId(Integer shiftId) { + this.shiftId = shiftId; + } + + public String getShiftDesc() { + return shiftDesc; + } + + public void setShiftDesc(String shiftDesc) { + this.shiftDesc = shiftDesc; + } + + public MesShift(Integer shiftId, String shiftDesc) { + this.shiftId = shiftId; + this.shiftDesc = shiftDesc; + } + + public MesShift() { + } +} 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 c8f777dff..0a15f0173 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 @@ -85,4 +85,6 @@ public interface MesReportWorkMapper { Map getHourProductionList(MesHourReport mesHourReport); List getEquNames(MesHourReport mesHourReport); + + List selectProShift(); } 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 4583c09ee..3a3588823 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 @@ -75,4 +75,6 @@ public interface IMesReportWorkService { LineChartDto getLineChartData(MesReportProduction mesReportProduction); List getHourProductionList(MesHourReport mesHourReport); + + List getProShifts(); } 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 a58c50d71..58062566a 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 @@ -150,7 +150,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { List totals = null; List everys = null; if("equ_type_lg".equals(boardDTO.getEquTypeCode())){//equ_type_lg 湿料罐 - boardDTO.setYmd(boardDTO.getYmd().replace("-","")); + totals = mesMapper.getTotalNumL(boardDTO); everys = mesMapper.getEveryNumL(boardDTO); }else{//成型机、烘房、收坯机 @@ -158,7 +158,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { everys = mesMapper.getEveryNum(boardDTO); } - boardMap.put("totalNum", totals); boardMap.put("everyNum", everys); return boardMap; 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 ebd15a20b..13963b842 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 @@ -289,6 +289,16 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { return days; } + /** + * 获取班次信息list + * @return + */ + @Override + @DS("#header.poolName") + public List getProShifts() { + return mesReportWorkMapper.selectProShift(); + } + 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/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 04cd7632a..f08736df5 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -116,23 +116,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(0) totalNum, equ.equipment_type_code equTypeCode, equ.equipment_type_name equTypeName - from pro_lg_used_log mt - left join base_equipment equ on mt.device_code = equ.equipment_code - where mt.createDate = #{ymd} and equ.equipment_name is not null - and equ.equipment_type_code = #{equTypeCode} + from mes_material_transfer_result mt + left join base_equipment equ on mt.equipmentCode = equ.equipment_code + where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null + and equ.equipment_type_code = #{equTypeCode} and mt.status = 2 group by equ.equipment_type_code, equ.equipment_type_name 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 61c3a72d5..1d1c7b471 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 @@ -105,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join pro_order_workorder pow on pow.workorder_id = mt.OrderCode left join pro_process ps on ps.process_id = mt.now_process_id where pow.order_code is not null + + and pow.shift_id = #{shiftId} + and pow.order_code like concat('%', #{orderCode}, '%') @@ -255,6 +258,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where 1=1 and CONVERT(varchar(30),mt.update_time, 120) >= #{productDateStart} and #{productDateEnd} > CONVERT(varchar(30),mt.update_time, 120) + + and pow.shift_id = #{shiftId} + and pow.order_code like concat('%', #{orderCode}, '%') @@ -297,7 +303,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_equipment equ on mt.equipmentCode = equ.equipment_code left join pro_order_workorder pow on pow.workorder_id = mt.OrderCode where pow.order_code is not null - + + and pow.shift_id = #{shiftId} + and pow.order_code like concat('%', #{orderCode}, '%') @@ -318,6 +326,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.equipmentCode, equ.equipment_name + insert into mes_report_work From 50da3686fb823547bfca95320c3138e2eee06763 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 17 Oct 2023 11:12:46 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- op-modules/op-device/push-device.bat | 40 ++++++++++++++++++++++++++++ op-modules/op-sap/push-sap.bat | 5 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 op-modules/op-device/push-device.bat diff --git a/op-modules/op-device/push-device.bat b/op-modules/op-device/push-device.bat new file mode 100644 index 000000000..20d4d5b76 --- /dev/null +++ b/op-modules/op-device/push-device.bat @@ -0,0 +1,40 @@ +@echo off +echo --------------------------------Զǰ޸-------------------------------------- +set jarName=op-modules-device.jar +set profile=dev +set imageURI=192.168.202.36:30002/op-lanju/op-device +rem echo ȡǰַ +for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c +rem echo ȡǰʱַ +for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b +rem echo 統ǰСʱС10ո滻Ϊ0 +set T=%T: =0% +rem echo ʾʱַ +set imageVersion=%D%%T% +::Ϣ +echo jar:%jarName% +echo :%profile% +echo ַ:%imageURI% +echo 汾:%imageVersion% + +echo --------------------------------mvn package...-------------------------------- +::call mvn clean package -Dmaven.test.skip=true + +cd .\target +SET df=Dockerfile +if exist %df% ( + del /f /s /q .\Dockerfile +) +echo --------------------------------Dockerfile-------------------------------- +echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile +echo COPY %jarName% /application.jar >> Dockerfile +echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile +echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile +dir +echo --------------------------------docker login...------------------------------- +docker login 192.168.202.36:30002 -u deploy -p Deploy@2023 +echo --------------------------------docker build...------------------------------- +docker build -t %imageURI%:%imageVersion% . +echo --------------------------------docker push...-------------------------------- +docker push %imageURI%:%imageVersion% +@pause \ No newline at end of file diff --git a/op-modules/op-sap/push-sap.bat b/op-modules/op-sap/push-sap.bat index bbf636108..81d7c0585 100644 --- a/op-modules/op-sap/push-sap.bat +++ b/op-modules/op-sap/push-sap.bat @@ -27,7 +27,8 @@ if exist %df% ( del /f /s /q .\Dockerfile ) echo --------------------------------Dockerfile-------------------------------- -echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile +echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile +::echo RUN apk add libuuid libuuid-devel >> Dockerfile echo ADD libsapjco3.so /usr/lib/libsapjco3.so >> Dockerfile echo ADD sapjco3.jar /usr/lib/sapjco3.jar >> Dockerfile echo RUN chmod a+x -R /usr/lib/libsapjco3.so >> Dockerfile @@ -37,7 +38,7 @@ echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile dir echo --------------------------------docker login...------------------------------- -docker login 192.168.202.36:30002 -u deploy -p Deploy@2023 +docker login 192.168.202.36:30002 -u admin -p Harbor@2023 echo --------------------------------docker build...------------------------------- docker build -t %imageURI%:%imageVersion% . echo --------------------------------docker push...-------------------------------- From bce6390db616766fa7ddb2e49778b4837c0ab870 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 17 Oct 2023 14:54:23 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=85=A5=E5=BA=93+=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SparePartsInOutStorageController.java | 97 +++++ ...r.java => SparePartsLedgerController.java} | 30 +- .../op/device/domain/SparePartsInStorage.java | 352 ++++++++++++++++++ .../mapper/SparePartsInOutStorageMapper.java | 61 +++ .../device/mapper/SparePartsLedgerMapper.java | 61 +++ .../mapper/WmsOdsMateStorageNewsMapper.java | 61 --- .../ISparePartsInOutStorageService.java | 60 +++ ...ice.java => ISparePartsLedgerService.java} | 23 +- .../SparePartsInOutStorageServiceImpl.java | 94 +++++ .../impl/SparePartsLedgerServiceImpl.java | 95 +++++ .../WmsOdsMateStorageNewsServiceImpl.java | 95 ----- .../device/SparePartsInOutStorageMapper.xml | 187 ++++++++++ ...sMapper.xml => SparePartsLedgerMapper.xml} | 22 +- 13 files changed, 1045 insertions(+), 193 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java rename op-modules/op-device/src/main/java/com/op/device/controller/{WmsOdsMateStorageNewsController.java => SparePartsLedgerController.java} (65%) create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java rename op-modules/op-device/src/main/java/com/op/device/service/{IWmsOdsMateStorageNewsService.java => ISparePartsLedgerService.java} (50%) create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml rename op-modules/op-device/src/main/resources/mapper/device/{WmsOdsMateStorageNewsMapper.xml => SparePartsLedgerMapper.xml} (94%) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java new file mode 100644 index 000000000..f9f5f329c --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java @@ -0,0 +1,97 @@ +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; +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.device.domain.SparePartsInStorage; +import com.op.device.service.ISparePartsInOutStorageService; +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 2023-10-17 + */ +@RestController +@RequestMapping("/sparepartsInOutStorage") +public class SparePartsInOutStorageController extends BaseController { + @Autowired + private ISparePartsInOutStorageService sparePartsInOutStorageService; + + /** + * 查询备品备件出入库列表 + */ + @RequiresPermissions("device:sparepartsInOutStorage:list") + @GetMapping("/list") + public TableDataInfo list(SparePartsInStorage sparePartsInStorage) { + startPage(); + List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); + return getDataTable(list); + } + + /** + * 导出备品备件出入库列表 + */ + @RequiresPermissions("device:sparepartsInOutStorage:export") + @Log(title = "备品备件出入库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SparePartsInStorage sparePartsInStorage) { + List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); + ExcelUtil util = new ExcelUtil(SparePartsInStorage.class); + util.exportExcel(response, list, "备品备件出入库数据"); + } + + /** + * 获取备品备件出入库详细信息 + */ + @RequiresPermissions("device:sparepartsInOutStorage:query") + @GetMapping(value = "/{rawOrderInSnId}") + public AjaxResult getInfo(@PathVariable("rawOrderInSnId") String rawOrderInSnId) { + return success(sparePartsInOutStorageService.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId)); + } + + /** + * 新增备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:add") + @Log(title = "备品备件出入库", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SparePartsInStorage sparePartsInStorage) { + return toAjax(sparePartsInOutStorageService.insertSparePartsInStorage(sparePartsInStorage)); + } + + /** + * 修改备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:edit") + @Log(title = "备品备件出入库", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SparePartsInStorage sparePartsInStorage) { + return toAjax(sparePartsInOutStorageService.updateSparePartsInStorage(sparePartsInStorage)); + } + + /** + * 删除备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:remove") + @Log(title = "备品备件出入库", businessType = BusinessType.DELETE) + @DeleteMapping("/{rawOrderInSnIds}") + public AjaxResult remove(@PathVariable String[] rawOrderInSnIds) { + return toAjax(sparePartsInOutStorageService.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java similarity index 65% rename from op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java rename to op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java index 16841303e..74e3aaebb 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java @@ -14,8 +14,8 @@ 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.device.domain.WmsOdsMateStorageNews; -import com.op.device.service.IWmsOdsMateStorageNewsService; +import com.op.device.domain.SparePartsLedger; +import com.op.device.service.ISparePartsLedgerService; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.utils.poi.ExcelUtil; @@ -29,18 +29,18 @@ import com.op.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/sparePartsLedger") -public class WmsOdsMateStorageNewsController extends BaseController { +public class SparePartsLedgerController extends BaseController { @Autowired - private IWmsOdsMateStorageNewsService wmsOdsMateStorageNewsService; + private ISparePartsLedgerService sparePartsLedgerService; /** * 查询备品备件台账管理列表 */ @RequiresPermissions("device:sparePartsLedger:list") @GetMapping("/list") - public TableDataInfo list(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + public TableDataInfo list(SparePartsLedger sparePartsLedger) { startPage(); - List list = wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); + List list = sparePartsLedgerService.selectSparePartsLedgerList(sparePartsLedger); return getDataTable(list); } @@ -50,9 +50,9 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:export") @Log(title = "备品备件台账管理", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, WmsOdsMateStorageNews wmsOdsMateStorageNews) { - List list = wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); - ExcelUtil util = new ExcelUtil(WmsOdsMateStorageNews.class); + public void export(HttpServletResponse response, SparePartsLedger sparePartsLedger) { + List list = sparePartsLedgerService.selectSparePartsLedgerList(sparePartsLedger); + ExcelUtil util = new ExcelUtil(SparePartsLedger.class); util.exportExcel(response, list, "备品备件台账管理数据"); } @@ -62,7 +62,7 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:query") @GetMapping(value = "/{storageId}") public AjaxResult getInfo(@PathVariable("storageId") String storageId) { - return success(wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsByStorageId(storageId)); + return success(sparePartsLedgerService.selectSparePartsLedgerByStorageId(storageId)); } /** @@ -71,8 +71,8 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:add") @Log(title = "备品备件台账管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return toAjax(wmsOdsMateStorageNewsService.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews)); + public AjaxResult add(@RequestBody SparePartsLedger sparePartsLedger) { + return toAjax(sparePartsLedgerService.insertSparePartsLedger(sparePartsLedger)); } /** @@ -81,8 +81,8 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:edit") @Log(title = "备品备件台账管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return toAjax(wmsOdsMateStorageNewsService.updateWmsOdsMateStorageNews(wmsOdsMateStorageNews)); + public AjaxResult edit(@RequestBody SparePartsLedger sparePartsLedger) { + return toAjax(sparePartsLedgerService.updateSparePartsLedger(sparePartsLedger)); } /** @@ -92,6 +92,6 @@ public class WmsOdsMateStorageNewsController extends BaseController { @Log(title = "备品备件台账管理", businessType = BusinessType.DELETE) @DeleteMapping("/{storageIds}") public AjaxResult remove(@PathVariable String[] storageIds) { - return toAjax(wmsOdsMateStorageNewsService.deleteWmsOdsMateStorageNewsByStorageIds(storageIds)); + return toAjax(sparePartsLedgerService.deleteSparePartsLedgerByStorageIds(storageIds)); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java new file mode 100644 index 000000000..83edcdcce --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java @@ -0,0 +1,352 @@ +package com.op.device.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +/** + * 备品备件出入库对象 wms_raw_order_in_sn + * + * @author Open Platform + * @date 2023-10-17 + */ +public class SparePartsInStorage extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 唯一序列号 */ + private String rawOrderInSnId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String whCode; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String waCode; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String wlCode; + + /** 入库单号 */ + @Excel(name = "入库单号") + private String orderNo; + + /** 采购订单号 */ + @Excel(name = "采购订单号") + private String poNo; + + /** 采购订单行项目 */ + @Excel(name = "采购订单行项目") + private String poLine; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDesc; + + /** sn/LPN */ + @Excel(name = "sn/LPN") + private String sn; + + /** 数量 */ + @Excel(name = "数量") + private BigDecimal amount; + + /** 备用1 */ + @Excel(name = "备用1") + private String userDefined1; + + /** 备用2 */ + @Excel(name = "备用2") + private String userDefined2; + + /** 备用3 */ + @Excel(name = "备用3") + private String userDefined3; + + /** 备用4 */ + @Excel(name = "备用4") + private String userDefined4; + + /** 备用5 */ + @Excel(name = "备用5") + private String userDefined5; + + /** 备用6 */ + @Excel(name = "备用6") + private String userDefined6; + + /** 备用7 */ + @Excel(name = "备用7") + private String userDefined7; + + /** 备用8 */ + @Excel(name = "备用8") + private String userDefined8; + + /** 备用9 */ + @Excel(name = "备用9") + private String userDefined9; + + /** 备用10 */ + @Excel(name = "备用10") + private String userDefined10; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtCreate; + + /** 最后更新人 */ + @Excel(name = "最后更新人") + private String lastModifiedBy; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtModified; + + /** 有效标记 */ + @Excel(name = "有效标记") + private String activeFlag; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String factoryCode; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String sapFactoryCode; + + public void setRawOrderInSnId(String rawOrderInSnId) { + this.rawOrderInSnId = rawOrderInSnId; + } + + public String getRawOrderInSnId() { + return rawOrderInSnId; + } + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + public void setPoNo(String poNo) { + this.poNo = poNo; + } + + public String getPoNo() { + return poNo; + } + public void setPoLine(String poLine) { + this.poLine = poLine; + } + + public String getPoLine() { + return poLine; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialDesc(String materialDesc) { + this.materialDesc = materialDesc; + } + + public String getMaterialDesc() { + return materialDesc; + } + public void setSn(String sn) { + this.sn = sn; + } + + public String getSn() { + return sn; + } + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getAmount() { + return amount; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + public void setUserDefined6(String userDefined6) { + this.userDefined6 = userDefined6; + } + + public String getUserDefined6() { + return userDefined6; + } + public void setUserDefined7(String userDefined7) { + this.userDefined7 = userDefined7; + } + + public String getUserDefined7() { + return userDefined7; + } + public void setUserDefined8(String userDefined8) { + this.userDefined8 = userDefined8; + } + + public String getUserDefined8() { + return userDefined8; + } + public void setUserDefined9(String userDefined9) { + this.userDefined9 = userDefined9; + } + + public String getUserDefined9() { + return userDefined9; + } + public void setUserDefined10(String userDefined10) { + this.userDefined10 = userDefined10; + } + + public String getUserDefined10() { + return userDefined10; + } + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public Date getGmtCreate() { + return gmtCreate; + } + public void setLastModifiedBy(String lastModifiedBy) { + this.lastModifiedBy = lastModifiedBy; + } + + public String getLastModifiedBy() { + return lastModifiedBy; + } + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + public Date getGmtModified() { + return gmtModified; + } + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setSapFactoryCode(String sapFactoryCode) { + this.sapFactoryCode = sapFactoryCode; + } + + public String getSapFactoryCode() { + return sapFactoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("rawOrderInSnId", getRawOrderInSnId()) + .append("whCode", getWhCode()) + .append("waCode", getWaCode()) + .append("wlCode", getWlCode()) + .append("orderNo", getOrderNo()) + .append("poNo", getPoNo()) + .append("poLine", getPoLine()) + .append("materialCode", getMaterialCode()) + .append("materialDesc", getMaterialDesc()) + .append("sn", getSn()) + .append("amount", getAmount()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .append("userDefined6", getUserDefined6()) + .append("userDefined7", getUserDefined7()) + .append("userDefined8", getUserDefined8()) + .append("userDefined9", getUserDefined9()) + .append("userDefined10", getUserDefined10()) + .append("createBy", getCreateBy()) + .append("gmtCreate", getGmtCreate()) + .append("lastModifiedBy", getLastModifiedBy()) + .append("gmtModified", getGmtModified()) + .append("activeFlag", getActiveFlag()) + .append("factoryCode", getFactoryCode()) + .append("sapFactoryCode", getSapFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java new file mode 100644 index 000000000..3c04e3698 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.SparePartsInStorage; + +/** + * 备品备件出入库Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface SparePartsInOutStorageMapper { + /** + * 查询备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 备品备件出入库 + */ + public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + + /** + * 查询备品备件出入库列表 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 备品备件出入库集合 + */ + public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); + + /** + * 新增备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 修改备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 删除备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + + /** + * 批量删除备品备件出入库 + * + * @param rawOrderInSnIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java new file mode 100644 index 000000000..01568182d --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.SparePartsLedger; + +/** + * 备品备件台账管理Mapper接口 + * + * @author Open Platform + * @date 2023-10-13 + */ +public interface SparePartsLedgerMapper { + /** + * 查询备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 备品备件台账管理 + */ + public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId); + + /** + * 查询备品备件台账管理列表 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 备品备件台账管理集合 + */ + public List selectSparePartsLedgerList(SparePartsLedger sparePartsLedger); + + /** + * 新增备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + public int insertSparePartsLedger(SparePartsLedger sparePartsLedger); + + /** + * 修改备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + public int updateSparePartsLedger(SparePartsLedger sparePartsLedger); + + /** + * 删除备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 结果 + */ + public int deleteSparePartsLedgerByStorageId(String storageId); + + /** + * 批量删除备品备件台账管理 + * + * @param storageIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSparePartsLedgerByStorageIds(String[] storageIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java deleted file mode 100644 index cafa5899b..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.op.device.mapper; - -import java.util.List; - -import com.op.device.domain.WmsOdsMateStorageNews; - -/** - * 备品备件台账管理Mapper接口 - * - * @author Open Platform - * @date 2023-10-13 - */ -public interface WmsOdsMateStorageNewsMapper { - /** - * 查询备品备件台账管理 - * - * @param storageId 备品备件台账管理主键 - * @return 备品备件台账管理 - */ - public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId); - - /** - * 查询备品备件台账管理列表 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 备品备件台账管理集合 - */ - public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); - - /** - * 新增备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); - - /** - * 修改备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); - - /** - * 删除备品备件台账管理 - * - * @param storageId 备品备件台账管理主键 - * @return 结果 - */ - public int deleteWmsOdsMateStorageNewsByStorageId(String storageId); - - /** - * 批量删除备品备件台账管理 - * - * @param storageIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds); -} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java new file mode 100644 index 000000000..db0055079 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.SparePartsInStorage; + +/** + * 备品备件出入库Service接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface ISparePartsInOutStorageService { + /** + * 查询备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 备品备件出入库 + */ + public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + + /** + * 查询备品备件出入库列表 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 备品备件出入库集合 + */ + public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); + + /** + * 新增备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 修改备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 批量删除备品备件出入库 + * + * @param rawOrderInSnIds 需要删除的备品备件出入库主键集合 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); + + /** + * 删除备品备件出入库信息 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java similarity index 50% rename from op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java rename to op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java index 1330881fb..29d80760c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java @@ -1,7 +1,8 @@ package com.op.device.service; import java.util.List; -import com.op.device.domain.WmsOdsMateStorageNews; + +import com.op.device.domain.SparePartsLedger; /** * 备品备件台账管理Service接口 @@ -9,38 +10,38 @@ import com.op.device.domain.WmsOdsMateStorageNews; * @author Open Platform * @date 2023-10-13 */ -public interface IWmsOdsMateStorageNewsService { +public interface ISparePartsLedgerService { /** * 查询备品备件台账管理 * * @param storageId 备品备件台账管理主键 * @return 备品备件台账管理 */ - public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId); + public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId); /** * 查询备品备件台账管理列表 * - * @param wmsOdsMateStorageNews 备品备件台账管理 + * @param sparePartsLedger 备品备件台账管理 * @return 备品备件台账管理集合 */ - public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public List selectSparePartsLedgerList(SparePartsLedger sparePartsLedger); /** * 新增备品备件台账管理 * - * @param wmsOdsMateStorageNews 备品备件台账管理 + * @param sparePartsLedger 备品备件台账管理 * @return 结果 */ - public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public int insertSparePartsLedger(SparePartsLedger sparePartsLedger); /** * 修改备品备件台账管理 * - * @param wmsOdsMateStorageNews 备品备件台账管理 + * @param sparePartsLedger 备品备件台账管理 * @return 结果 */ - public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public int updateSparePartsLedger(SparePartsLedger sparePartsLedger); /** * 批量删除备品备件台账管理 @@ -48,7 +49,7 @@ public interface IWmsOdsMateStorageNewsService { * @param storageIds 需要删除的备品备件台账管理主键集合 * @return 结果 */ - public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds); + public int deleteSparePartsLedgerByStorageIds(String[] storageIds); /** * 删除备品备件台账管理信息 @@ -56,5 +57,5 @@ public interface IWmsOdsMateStorageNewsService { * @param storageId 备品备件台账管理主键 * @return 结果 */ - public int deleteWmsOdsMateStorageNewsByStorageId(String storageId); + public int deleteSparePartsLedgerByStorageId(String storageId); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java new file mode 100644 index 000000000..69754cf11 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java @@ -0,0 +1,94 @@ +package com.op.device.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.SparePartsInOutStorageMapper; +import com.op.device.domain.SparePartsInStorage; +import com.op.device.service.ISparePartsInOutStorageService; + +/** + * 备品备件出入库Service业务层处理 + * + * @author Open Platform + * @date 2023-10-17 + */ +@Service +public class SparePartsInOutStorageServiceImpl implements ISparePartsInOutStorageService { + @Autowired + private SparePartsInOutStorageMapper sparePartsInOutStorageMapper; + + /** + * 查询备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 备品备件出入库 + */ + @Override + @DS("#header.poolName") + public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { + return sparePartsInOutStorageMapper.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); + } + + /** + * 查询备品备件出入库列表 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 备品备件出入库 + */ + @Override + @DS("#header.poolName") + public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage) { + return sparePartsInOutStorageMapper.selectSparePartsInStorageList(sparePartsInStorage); + } + + /** + * 新增备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { + return sparePartsInOutStorageMapper.insertSparePartsInStorage(sparePartsInStorage); + } + + /** + * 修改备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { + return sparePartsInOutStorageMapper.updateSparePartsInStorage(sparePartsInStorage); + } + + /** + * 批量删除备品备件出入库 + * + * @param rawOrderInSnIds 需要删除的备品备件出入库主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds) { + return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds); + } + + /** + * 删除备品备件出入库信息 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { + return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java new file mode 100644 index 000000000..1921561a1 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java @@ -0,0 +1,95 @@ +package com.op.device.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.SparePartsLedgerMapper; +import com.op.device.domain.SparePartsLedger; +import com.op.device.service.ISparePartsLedgerService; + +/** + * 备品备件台账管理Service业务层处理 + * + * @author Open Platform + * @date 2023-10-13 + */ +@Service +public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService { + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; + + /** + * 查询备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 备品备件台账管理 + */ + @Override + @DS("#header.poolName") + public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId) { + return sparePartsLedgerMapper.selectSparePartsLedgerByStorageId(storageId); + } + + /** + * 查询备品备件台账管理列表 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 备品备件台账管理 + */ + @Override + @DS("#header.poolName") + public List selectSparePartsLedgerList(SparePartsLedger sparePartsLedger) { + sparePartsLedger.setStorageType("SP"); + return sparePartsLedgerMapper.selectSparePartsLedgerList(sparePartsLedger); + } + + /** + * 新增备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertSparePartsLedger(SparePartsLedger sparePartsLedger) { + return sparePartsLedgerMapper.insertSparePartsLedger(sparePartsLedger); + } + + /** + * 修改备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateSparePartsLedger(SparePartsLedger sparePartsLedger) { + return sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + + /** + * 批量删除备品备件台账管理 + * + * @param storageIds 需要删除的备品备件台账管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsLedgerByStorageIds(String[] storageIds) { + return sparePartsLedgerMapper.deleteSparePartsLedgerByStorageIds(storageIds); + } + + /** + * 删除备品备件台账管理信息 + * + * @param storageId 备品备件台账管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsLedgerByStorageId(String storageId) { + return sparePartsLedgerMapper.deleteSparePartsLedgerByStorageId(storageId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java deleted file mode 100644 index af7c4c868..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.op.device.service.impl; - -import java.util.List; - -import com.baomidou.dynamic.datasource.annotation.DS; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.op.device.mapper.WmsOdsMateStorageNewsMapper; -import com.op.device.domain.WmsOdsMateStorageNews; -import com.op.device.service.IWmsOdsMateStorageNewsService; - -/** - * 备品备件台账管理Service业务层处理 - * - * @author Open Platform - * @date 2023-10-13 - */ -@Service -public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsService { - @Autowired - private WmsOdsMateStorageNewsMapper wmsOdsMateStorageNewsMapper; - - /** - * 查询备品备件台账管理 - * - * @param storageId 备品备件台账管理主键 - * @return 备品备件台账管理 - */ - @Override - @DS("#header.poolName") - public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId) { - return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsByStorageId(storageId); - } - - /** - * 查询备品备件台账管理列表 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 备品备件台账管理 - */ - @Override - @DS("#header.poolName") - public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews) { - wmsOdsMateStorageNews.setStorageType("SP"); - return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); - } - - /** - * 新增备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews); - } - - /** - * 修改备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNews(wmsOdsMateStorageNews); - } - - /** - * 批量删除备品备件台账管理 - * - * @param storageIds 需要删除的备品备件台账管理主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds) { - return wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsByStorageIds(storageIds); - } - - /** - * 删除备品备件台账管理信息 - * - * @param storageId 备品备件台账管理主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteWmsOdsMateStorageNewsByStorageId(String storageId) { - return wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsByStorageId(storageId); - } -} diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml new file mode 100644 index 000000000..2d7903eef --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select raw_order_in_sn_id, wh_code, wa_code, wl_code, order_no, po_no, po_line, material_code, material_desc, sn, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_raw_order_in_sn + + + + + + + + insert into wms_raw_order_in_sn + + raw_order_in_sn_id, + wh_code, + wa_code, + wl_code, + order_no, + po_no, + po_line, + material_code, + material_desc, + sn, + amount, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + user_defined6, + user_defined7, + user_defined8, + user_defined9, + user_defined10, + create_by, + gmt_create, + last_modified_by, + gmt_modified, + active_flag, + factory_code, + sap_factory_code, + + + #{rawOrderInSnId}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{orderNo}, + #{poNo}, + #{poLine}, + #{materialCode}, + #{materialDesc}, + #{sn}, + #{amount}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{createBy}, + #{gmtCreate}, + #{lastModifiedBy}, + #{gmtModified}, + #{activeFlag}, + #{factoryCode}, + #{sapFactoryCode}, + + + + + update wms_raw_order_in_sn + + wh_code = #{whCode}, + wa_code = #{waCode}, + wl_code = #{wlCode}, + order_no = #{orderNo}, + po_no = #{poNo}, + po_line = #{poLine}, + material_code = #{materialCode}, + material_desc = #{materialDesc}, + sn = #{sn}, + amount = #{amount}, + user_defined1 = #{userDefined1}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + user_defined6 = #{userDefined6}, + user_defined7 = #{userDefined7}, + user_defined8 = #{userDefined8}, + user_defined9 = #{userDefined9}, + user_defined10 = #{userDefined10}, + create_by = #{createBy}, + gmt_create = #{gmtCreate}, + last_modified_by = #{lastModifiedBy}, + gmt_modified = #{gmtModified}, + active_flag = #{activeFlag}, + factory_code = #{factoryCode}, + sap_factory_code = #{sapFactoryCode}, + + where raw_order_in_sn_id = #{rawOrderInSnId} + + + + delete from wms_raw_order_in_sn where raw_order_in_sn_id = #{rawOrderInSnId} + + + + delete from wms_raw_order_in_sn where raw_order_in_sn_id in + + #{rawOrderInSnId} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml similarity index 94% rename from op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml rename to op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml index c402c2fb0..dd5b16320 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -31,12 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select storage_type, material_code, material_desc, amount,sap_factory_code, wl_name, del_flag, spare_use_life, spare_name, spare_mode, spare_manufacturer, spare_supplier, spare_replacement_cycle, spare_measurement_unit, spare_conversion_unit, spare_conversion_ratio, spare_inventory_floor, spare_inventory_upper,spare_type,create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code from wms_ods_mate_storage_news - + and storage_id = #{storageId} and wh_code = #{whCode} @@ -86,14 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + where storage_id = #{storageId} and del_flag = '0' and storage_tpye = 'SP' - + insert into wms_ods_mate_storage_news storage_id, @@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update wms_ods_mate_storage_news wh_code = #{whCode}, @@ -245,11 +245,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where storage_id = #{storageId} - + delete from wms_ods_mate_storage_news where storage_id = #{storageId} - + delete from wms_ods_mate_storage_news where storage_id in #{storageId} From 91c175fff1b936942aeee9a1322a9c1867ce8f37 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 17 Oct 2023 14:57:58 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{WmsOdsMateStorageNews.java => SparePartsLedger.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename op-modules/op-device/src/main/java/com/op/device/domain/{WmsOdsMateStorageNews.java => SparePartsLedger.java} (99%) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/WmsOdsMateStorageNews.java b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java similarity index 99% rename from op-modules/op-device/src/main/java/com/op/device/domain/WmsOdsMateStorageNews.java rename to op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java index f95271c09..dd326cb38 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/WmsOdsMateStorageNews.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java @@ -14,7 +14,7 @@ import com.op.common.core.web.domain.BaseEntity; * @author Open Platform * @date 2023-10-13 */ -public class WmsOdsMateStorageNews extends BaseEntity { +public class SparePartsLedger extends BaseEntity { private static final long serialVersionUID = 1L; /** 唯一序列 */ From 54715aaf0b6939e388c572f66601d1bfc69f6862 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Tue, 17 Oct 2023 17:16:53 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ABAP_AS_WITH_POOL.jcoDestination | 11 + .../device/controller/EquPlanController.java | 28 ++ .../com/op/device/domain/BaseEquipment.java | 448 ++++++++++++++++++ .../java/com/op/device/domain/EquPlan.java | 11 + .../com/op/device/domain/EquPlanDetail.java | 218 +++++++++ .../java/com/op/device/domain/EquPlanEqu.java | 158 ++++++ .../com/op/device/domain/EquPlanStandard.java | 194 ++++++++ .../device/domain/dto/InspectionPlanDTO.java | 319 +++++++++++++ .../op/device/domain/vo/InspectionPlanVO.java | 6 + .../op/device/mapper/BaseEquipmentMapper.java | 61 +++ .../op/device/mapper/EquPlanDetailMapper.java | 61 +++ .../op/device/mapper/EquPlanEquMapper.java | 61 +++ .../com/op/device/mapper/EquPlanMapper.java | 2 + .../device/mapper/EquPlanStandardMapper.java | 61 +++ .../op/device/service/IEquPlanService.java | 20 + .../service/impl/EquPlanServiceImpl.java | 30 ++ .../mapper/device/BaseEquipmentMapper.xml | 242 ++++++++++ .../mapper/device/EquPlanDetailMapper.xml | 138 ++++++ .../mapper/device/EquPlanEquMapper.xml | 113 +++++ .../mapper/device/EquPlanStandardMapper.xml | 133 ++++++ 20 files changed, 2315 insertions(+) create mode 100644 ABAP_AS_WITH_POOL.jcoDestination create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionPlanVO.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination new file mode 100644 index 000000000..836417d99 --- /dev/null +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -0,0 +1,11 @@ +#for test only! +#Tue Oct 17 09:57:19 CST 2023 +jco.destination.pool_capacity=true +jco.client.lang=zh +jco.client.ashost=192.168.0.53 +jco.client.saprouter= +jco.client.user=MES +jco.client.sysnr=0 +jco.destination.peak_limit=20 +jco.client.passwd=123456 +jco.client.client=800 diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java index a03f50cc5..a2c3482aa 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -2,6 +2,11 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.op.device.domain.BaseEquipment; +import com.op.device.domain.EquPlanEqu; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +38,29 @@ public class EquPlanController extends BaseController { @Autowired private IEquPlanService equPlanService; + /** + * 处理计划-设备信息 + * @param equPlanEquList + * @return + */ + @PostMapping("/formatEquItem") + public AjaxResult formatEquItem(@RequestBody List equPlanEquList) { + return equPlanService.formatEquItem(equPlanEquList); + } + + /** + * 获取设备信息list + * @param baseEquipment + * @return + */ + @RequiresPermissions("device:plan:list") + @GetMapping("/getEquList") + public TableDataInfo getEquList(BaseEquipment baseEquipment) { + startPage(); + List list = equPlanService.getEquList(baseEquipment); + return getDataTable(list); + } + /** * 查询计划列表 */ diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java new file mode 100644 index 000000000..c1e67dd2b --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java @@ -0,0 +1,448 @@ +package com.op.device.domain; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +/** + * 设备管理对象 base_equipment + * + * @author Open Platform + * @date 2023-10-17 + */ +public class BaseEquipment extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 设备ID */ + private Long equipmentId; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipmentName; + + /** 品牌 */ + @Excel(name = "品牌") + private String equipmentBrand; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String equipmentSpec; + + /** 设备类型ID */ + @Excel(name = "设备类型ID") + private Long equipmentTypeId; + + /** 设备类型编码 */ + @Excel(name = "设备类型编码") + private String equipmentTypeCode; + + /** 设备类型名称 */ + @Excel(name = "设备类型名称") + private String equipmentTypeName; + + /** 所属车间ID */ + @Excel(name = "所属车间ID") + private Long workshopId; + + /** 所属工作中心编码 */ + @Excel(name = "所属工作中心编码") + private String workshopCode; + + /** 所属工作中心名称 */ + @Excel(name = "所属工作中心名称") + private String workshopName; + + /** 设备状态,0异常 */ + @Excel(name = "设备状态,0异常") + private String status; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private Long attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private Long attr4; + + /** 工段 */ + @Excel(name = "工段") + private String workshopSection; + + /** 设备位置 */ + @Excel(name = "设备位置") + private String equipmentLocation; + + /** 工时单价 */ + @Excel(name = "工时单价") + private Long hourlyUnitPrice; + + /** 设备条码 */ + @Excel(name = "设备条码") + private String equipmentBarcode; + + /** 设备条码图片 */ + @Excel(name = "设备条码图片") + private String equipmentBarcodeImage; + + /** 生产厂商 */ + @Excel(name = "生产厂商") + private String manufacturer; + + /** 供应商 */ + @Excel(name = "供应商") + private String supplier; + + /** 使用寿命 */ + @Excel(name = "使用寿命") + private String useLife; + + /** 购买时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "购买时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date buyTime; + + /** 资产原值 */ + @Excel(name = "资产原值") + private String assetOriginalValue; + + /** 资产净值 */ + @Excel(name = "资产净值") + private String netAssetValue; + + /** 资产负责人 */ + @Excel(name = "资产负责人") + private String assetHead; + + /** 固定资产编码 */ + @Excel(name = "固定资产编码") + private String fixedAssetCode; + + /** 部门 */ + @Excel(name = "部门") + private String department; + + /** 单台能力工时 */ + @Excel(name = "单台能力工时") + private String unitWorkingHours; + + /** PLCIP */ + @Excel(name = "PLCIP") + private String plcIp; + + /** PLC端口 */ + @Excel(name = "PLC端口") + private Long plcPort; + + /** 删除标志1删除,0正常 */ + private String delFlag; + + /** SAP资产号 */ + @Excel(name = "SAP资产号") + private String sapAsset; + + public void setEquipmentId(Long equipmentId) { + this.equipmentId = equipmentId; + } + + public Long getEquipmentId() { + return equipmentId; + } + 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 setEquipmentBrand(String equipmentBrand) { + this.equipmentBrand = equipmentBrand; + } + + public String getEquipmentBrand() { + return equipmentBrand; + } + public void setEquipmentSpec(String equipmentSpec) { + this.equipmentSpec = equipmentSpec; + } + + public String getEquipmentSpec() { + return equipmentSpec; + } + public void setEquipmentTypeId(Long equipmentTypeId) { + this.equipmentTypeId = equipmentTypeId; + } + + public Long getEquipmentTypeId() { + return equipmentTypeId; + } + public void setEquipmentTypeCode(String equipmentTypeCode) { + this.equipmentTypeCode = equipmentTypeCode; + } + + public String getEquipmentTypeCode() { + return equipmentTypeCode; + } + public void setEquipmentTypeName(String equipmentTypeName) { + this.equipmentTypeName = equipmentTypeName; + } + + public String getEquipmentTypeName() { + return equipmentTypeName; + } + public void setWorkshopId(Long workshopId) { + this.workshopId = workshopId; + } + + public Long getWorkshopId() { + return workshopId; + } + public void setWorkshopCode(String workshopCode) { + this.workshopCode = workshopCode; + } + + public String getWorkshopCode() { + return workshopCode; + } + public void setWorkshopName(String workshopName) { + this.workshopName = workshopName; + } + + public String getWorkshopName() { + return workshopName; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + 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(Long attr3) { + this.attr3 = attr3; + } + + public Long getAttr3() { + return attr3; + } + public void setAttr4(Long attr4) { + this.attr4 = attr4; + } + + public Long getAttr4() { + return attr4; + } + public void setWorkshopSection(String workshopSection) { + this.workshopSection = workshopSection; + } + + public String getWorkshopSection() { + return workshopSection; + } + public void setEquipmentLocation(String equipmentLocation) { + this.equipmentLocation = equipmentLocation; + } + + public String getEquipmentLocation() { + return equipmentLocation; + } + public void setHourlyUnitPrice(Long hourlyUnitPrice) { + this.hourlyUnitPrice = hourlyUnitPrice; + } + + public Long getHourlyUnitPrice() { + return hourlyUnitPrice; + } + public void setEquipmentBarcode(String equipmentBarcode) { + this.equipmentBarcode = equipmentBarcode; + } + + public String getEquipmentBarcode() { + return equipmentBarcode; + } + public void setEquipmentBarcodeImage(String equipmentBarcodeImage) { + this.equipmentBarcodeImage = equipmentBarcodeImage; + } + + public String getEquipmentBarcodeImage() { + return equipmentBarcodeImage; + } + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + public String getManufacturer() { + return manufacturer; + } + public void setSupplier(String supplier) { + this.supplier = supplier; + } + + public String getSupplier() { + return supplier; + } + public void setUseLife(String useLife) { + this.useLife = useLife; + } + + public String getUseLife() { + return useLife; + } + public void setBuyTime(Date buyTime) { + this.buyTime = buyTime; + } + + public Date getBuyTime() { + return buyTime; + } + public void setAssetOriginalValue(String assetOriginalValue) { + this.assetOriginalValue = assetOriginalValue; + } + + public String getAssetOriginalValue() { + return assetOriginalValue; + } + public void setNetAssetValue(String netAssetValue) { + this.netAssetValue = netAssetValue; + } + + public String getNetAssetValue() { + return netAssetValue; + } + public void setAssetHead(String assetHead) { + this.assetHead = assetHead; + } + + public String getAssetHead() { + return assetHead; + } + public void setFixedAssetCode(String fixedAssetCode) { + this.fixedAssetCode = fixedAssetCode; + } + + public String getFixedAssetCode() { + return fixedAssetCode; + } + public void setDepartment(String department) { + this.department = department; + } + + public String getDepartment() { + return department; + } + public void setUnitWorkingHours(String unitWorkingHours) { + this.unitWorkingHours = unitWorkingHours; + } + + public String getUnitWorkingHours() { + return unitWorkingHours; + } + public void setPlcIp(String plcIp) { + this.plcIp = plcIp; + } + + public String getPlcIp() { + return plcIp; + } + public void setPlcPort(Long plcPort) { + this.plcPort = plcPort; + } + + public Long getPlcPort() { + return plcPort; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + public void setSapAsset(String sapAsset) { + this.sapAsset = sapAsset; + } + + public String getSapAsset() { + return sapAsset; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("equipmentId", getEquipmentId()) + .append("equipmentCode", getEquipmentCode()) + .append("equipmentName", getEquipmentName()) + .append("equipmentBrand", getEquipmentBrand()) + .append("equipmentSpec", getEquipmentSpec()) + .append("equipmentTypeId", getEquipmentTypeId()) + .append("equipmentTypeCode", getEquipmentTypeCode()) + .append("equipmentTypeName", getEquipmentTypeName()) + .append("workshopId", getWorkshopId()) + .append("workshopCode", getWorkshopCode()) + .append("workshopName", getWorkshopName()) + .append("status", getStatus()) + .append("remark", getRemark()) + .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("workshopSection", getWorkshopSection()) + .append("equipmentLocation", getEquipmentLocation()) + .append("hourlyUnitPrice", getHourlyUnitPrice()) + .append("equipmentBarcode", getEquipmentBarcode()) + .append("equipmentBarcodeImage", getEquipmentBarcodeImage()) + .append("manufacturer", getManufacturer()) + .append("supplier", getSupplier()) + .append("useLife", getUseLife()) + .append("buyTime", getBuyTime()) + .append("assetOriginalValue", getAssetOriginalValue()) + .append("netAssetValue", getNetAssetValue()) + .append("assetHead", getAssetHead()) + .append("fixedAssetCode", getFixedAssetCode()) + .append("department", getDepartment()) + .append("unitWorkingHours", getUnitWorkingHours()) + .append("plcIp", getPlcIp()) + .append("plcPort", getPlcPort()) + .append("delFlag", getDelFlag()) + .append("sapAsset", getSapAsset()) + .toString(); + } +} \ No newline at end of file diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java index 727018fa5..efa224cad 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java @@ -125,6 +125,17 @@ public class EquPlan extends BaseEntity { // 创建日期结束 private String createTimeEnd; + // 关联-计划->设备list + private List equPlanEquList; + + public List getEquPlanEquList() { + return equPlanEquList; + } + + public void setEquPlanEquList(List equPlanEquList) { + this.equPlanEquList = equPlanEquList; + } + public List getCreateTimeArray() { return createTimeArray; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java new file mode 100644 index 000000000..ddb7f9701 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java @@ -0,0 +1,218 @@ +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_plan_detail + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquPlanDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 详情编码 */ + @Excel(name = "详情编码") + private String code; + + /** 计划id */ + @Excel(name = "计划id") + private String planId; + + /** 关联上级表单 */ + @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 itemRemark; + + /** 工厂 */ + @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; + + // 关联-检查项->检查详情list + private List equPlanStandardList; + + public List getEquPlanStandardList() { + return equPlanStandardList; + } + + public void setEquPlanStandardList(List equPlanStandardList) { + this.equPlanStandardList = equPlanStandardList; + } + + 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 setPlanId(String planId) { + this.planId = planId; + } + + public String getPlanId() { + return planId; + } + 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 setItemRemark(String itemRemark) { + this.itemRemark = itemRemark; + } + + public String getItemRemark() { + return itemRemark; + } + 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("planId", getPlanId()) + .append("parentCode", getParentCode()) + .append("itemCode", getItemCode()) + .append("itemName", getItemName()) + .append("itemMethod", getItemMethod()) + .append("itemType", getItemType()) + .append("itemTypeName", getItemTypeName()) + .append("itemRemark", getItemRemark()) + .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/EquPlanEqu.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java new file mode 100644 index 000000000..f26dd20f9 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java @@ -0,0 +1,158 @@ +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_plan_equ + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquPlanEqu 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 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; + + // 关联-设备->检查项list + private List equPlanDetailList; + + public List getEquPlanDetailList() { + return equPlanDetailList; + } + + public void setEquPlanDetailList(List equPlanDetailList) { + this.equPlanDetailList = equPlanDetailList; + } + + 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 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("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/EquPlanStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java new file mode 100644 index 000000000..f5b1ae8a9 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java @@ -0,0 +1,194 @@ +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_plan_standard + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquPlanStandard 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 detailCode; + + /** 标准类型 */ + @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 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 setDetailCode(String detailCode) { + this.detailCode = detailCode; + } + + public String getDetailCode() { + return detailCode; + } + 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 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("detailCode", getDetailCode()) + .append("standardType", getStandardType()) + .append("standardName", getStandardName()) + .append("detailUpLimit", getDetailUpLimit()) + .append("detailDownLimit", getDetailDownLimit()) + .append("detailUnit", getDetailUnit()) + .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/dto/InspectionPlanDTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java new file mode 100644 index 000000000..93b3d829e --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java @@ -0,0 +1,319 @@ +package com.op.device.domain.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; +import java.util.List; + +// 巡检计划DTO +public class InspectionPlanDTO { + /** 主键 */ + private String planId; + + /** 计划编码 */ + private String planCode; + + /** 计划名称 */ + private String planName; + + /** 车间 */ + private String planWorkshop; + + /** 产线 */ + private String planProdLine; + + /** 设备名称 */ + private String equipmentName; + + /** 设备编码 */ + private String equipmentCode; + + /** 循环周期 */ + private String planLoop; + + /** 循环周期类型 */ + private String planLoopType; + + /** 循环执行时间开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planLoopStart; + + /** 循环执行时间结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planLoopEnd; + + /** 巡检人员 */ + private String planPerson; + + /** 计划状态 */ + private String planStatus; + + /** 是否可生产-限制 */ + private String planRestrict; + + /** 维护类型 */ + private String planType; + + /** 是否委外 */ + private String planOutsource; + + /** 委外工单编码 */ + private String workCode; + + /** 工厂 */ + private String factoryCode; + + /** 备用字段1 */ + private String attr1; + + /** 备用字段2 */ + private String attr2; + + /** 备用字段3 */ + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public String getPlanWorkshop() { + return planWorkshop; + } + + public void setPlanWorkshop(String planWorkshop) { + this.planWorkshop = planWorkshop; + } + + public String getPlanProdLine() { + return planProdLine; + } + + public void setPlanProdLine(String planProdLine) { + this.planProdLine = planProdLine; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentCode() { + return equipmentCode; + } + + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getPlanLoop() { + return planLoop; + } + + public void setPlanLoop(String planLoop) { + this.planLoop = planLoop; + } + + public String getPlanLoopType() { + return planLoopType; + } + + public void setPlanLoopType(String planLoopType) { + this.planLoopType = planLoopType; + } + + public Date getPlanLoopStart() { + return planLoopStart; + } + + public void setPlanLoopStart(Date planLoopStart) { + this.planLoopStart = planLoopStart; + } + + public Date getPlanLoopEnd() { + return planLoopEnd; + } + + public void setPlanLoopEnd(Date planLoopEnd) { + this.planLoopEnd = planLoopEnd; + } + + public String getPlanPerson() { + return planPerson; + } + + public void setPlanPerson(String planPerson) { + this.planPerson = planPerson; + } + + public String getPlanStatus() { + return planStatus; + } + + public void setPlanStatus(String planStatus) { + this.planStatus = planStatus; + } + + public String getPlanRestrict() { + return planRestrict; + } + + public void setPlanRestrict(String planRestrict) { + this.planRestrict = planRestrict; + } + + public String getPlanType() { + return planType; + } + + public void setPlanType(String planType) { + this.planType = planType; + } + + public String getPlanOutsource() { + return planOutsource; + } + + public void setPlanOutsource(String planOutsource) { + this.planOutsource = planOutsource; + } + + public String getWorkCode() { + return workCode; + } + + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr2() { + return attr2; + } + + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr3() { + return attr3; + } + + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionPlanVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionPlanVO.java new file mode 100644 index 000000000..86b86acb6 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionPlanVO.java @@ -0,0 +1,6 @@ +package com.op.device.domain.vo; + +// 巡检计划VO +public class InspectionPlanVO { + +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java new file mode 100644 index 000000000..759b0d0d6 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import com.op.device.domain.BaseEquipment; + +import java.util.List; + +/** + * 设备管理Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface BaseEquipmentMapper { + /** + * 查询设备管理 + * + * @param equipmentId 设备管理主键 + * @return 设备管理 + */ + public BaseEquipment selectBaseEquipmentByEquipmentId(Long equipmentId); + + /** + * 查询设备管理列表 + * + * @param baseEquipment 设备管理 + * @return 设备管理集合 + */ + public List selectBaseEquipmentList(BaseEquipment baseEquipment); + + /** + * 新增设备管理 + * + * @param baseEquipment 设备管理 + * @return 结果 + */ + public int insertBaseEquipment(BaseEquipment baseEquipment); + + /** + * 修改设备管理 + * + * @param baseEquipment 设备管理 + * @return 结果 + */ + public int updateBaseEquipment(BaseEquipment baseEquipment); + + /** + * 删除设备管理 + * + * @param equipmentId 设备管理主键 + * @return 结果 + */ + public int deleteBaseEquipmentByEquipmentId(Long equipmentId); + + /** + * 批量删除设备管理 + * + * @param equipmentIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds); +} \ No newline at end of file diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java new file mode 100644 index 000000000..4a1b453bf --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlanDetail; + +/** + * 计划详情-检查项信息Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquPlanDetailMapper { + /** + * 查询计划详情-检查项信息 + * + * @param id 计划详情-检查项信息主键 + * @return 计划详情-检查项信息 + */ + public EquPlanDetail selectEquPlanDetailById(String id); + + /** + * 查询计划详情-检查项信息列表 + * + * @param equPlanDetail 计划详情-检查项信息 + * @return 计划详情-检查项信息集合 + */ + public List selectEquPlanDetailList(EquPlanDetail equPlanDetail); + + /** + * 新增计划详情-检查项信息 + * + * @param equPlanDetail 计划详情-检查项信息 + * @return 结果 + */ + public int insertEquPlanDetail(EquPlanDetail equPlanDetail); + + /** + * 修改计划详情-检查项信息 + * + * @param equPlanDetail 计划详情-检查项信息 + * @return 结果 + */ + public int updateEquPlanDetail(EquPlanDetail equPlanDetail); + + /** + * 删除计划详情-检查项信息 + * + * @param id 计划详情-检查项信息主键 + * @return 结果 + */ + public int deleteEquPlanDetailById(String id); + + /** + * 批量删除计划详情-检查项信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanDetailByIds(String[] ids); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java new file mode 100644 index 000000000..3a8383361 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlanEqu; + +/** + * 计划详情-设备Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquPlanEquMapper { + /** + * 查询计划详情-设备 + * + * @param id 计划详情-设备主键 + * @return 计划详情-设备 + */ + public EquPlanEqu selectEquPlanEquById(String id); + + /** + * 查询计划详情-设备列表 + * + * @param equPlanEqu 计划详情-设备 + * @return 计划详情-设备集合 + */ + public List selectEquPlanEquList(EquPlanEqu equPlanEqu); + + /** + * 新增计划详情-设备 + * + * @param equPlanEqu 计划详情-设备 + * @return 结果 + */ + public int insertEquPlanEqu(EquPlanEqu equPlanEqu); + + /** + * 修改计划详情-设备 + * + * @param equPlanEqu 计划详情-设备 + * @return 结果 + */ + public int updateEquPlanEqu(EquPlanEqu equPlanEqu); + + /** + * 删除计划详情-设备 + * + * @param id 计划详情-设备主键 + * @return 结果 + */ + public int deleteEquPlanEquById(String id); + + /** + * 批量删除计划详情-设备 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanEquByIds(String[] ids); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java index b6d5e50e0..a6e220090 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java @@ -3,6 +3,8 @@ package com.op.device.mapper; import java.util.List; import com.op.device.domain.EquPlan; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; /** * 计划Mapper接口 diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java new file mode 100644 index 000000000..faaaeca13 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlanStandard; + +/** + * 计划详情-标准信息Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquPlanStandardMapper { + /** + * 查询计划详情-标准信息 + * + * @param id 计划详情-标准信息主键 + * @return 计划详情-标准信息 + */ + public EquPlanStandard selectEquPlanStandardById(String id); + + /** + * 查询计划详情-标准信息列表 + * + * @param equPlanStandard 计划详情-标准信息 + * @return 计划详情-标准信息集合 + */ + public List selectEquPlanStandardList(EquPlanStandard equPlanStandard); + + /** + * 新增计划详情-标准信息 + * + * @param equPlanStandard 计划详情-标准信息 + * @return 结果 + */ + public int insertEquPlanStandard(EquPlanStandard equPlanStandard); + + /** + * 修改计划详情-标准信息 + * + * @param equPlanStandard 计划详情-标准信息 + * @return 结果 + */ + public int updateEquPlanStandard(EquPlanStandard equPlanStandard); + + /** + * 删除计划详情-标准信息 + * + * @param id 计划详情-标准信息主键 + * @return 结果 + */ + public int deleteEquPlanStandardById(String id); + + /** + * 批量删除计划详情-标准信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanStandardByIds(String[] ids); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java index 24c603655..8f3239079 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java @@ -1,7 +1,13 @@ package com.op.device.service; import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.BaseEquipment; import com.op.device.domain.EquPlan; +import com.op.device.domain.EquPlanEqu; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; /** * 计划Service接口 @@ -57,4 +63,18 @@ public interface IEquPlanService { * @return 结果 */ public int deleteEquPlanByPlanId(String planId); + + /** + * 获取设备信息list + * @param baseEquipment + * @return + */ + List getEquList(BaseEquipment baseEquipment); + + /** + * 处理计划-设备信息 + * @param equPlanEquList + * @return + */ + AjaxResult formatEquItem(List equPlanEquList); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 96afd6ec7..bc276ae5e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -5,6 +5,12 @@ 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.BaseEquipment; +import com.op.device.domain.EquPlanEqu; +import com.op.device.domain.dto.InspectionPlanDTO; +import com.op.device.domain.vo.InspectionPlanVO; +import com.op.device.mapper.BaseEquipmentMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.mapper.EquPlanMapper; @@ -21,6 +27,8 @@ import com.op.device.service.IEquPlanService; public class EquPlanServiceImpl implements IEquPlanService { @Autowired private EquPlanMapper equPlanMapper; + @Autowired + private BaseEquipmentMapper baseEquipmentMapper; /** * 查询计划 @@ -111,4 +119,26 @@ public class EquPlanServiceImpl implements IEquPlanService { public int deleteEquPlanByPlanId(String planId) { return equPlanMapper.deleteEquPlanByPlanId(planId); } + + /** + * 获取设备信息list + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List getEquList(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment); + } + + /** + * 处理计划-设备信息 + * @param equPlanEquList + * @return + */ + @Override + public AjaxResult formatEquItem(List equPlanEquList) { + + return null; + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml new file mode 100644 index 000000000..61664188b --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price, equipment_barcode, equipment_barcode_image, manufacturer, supplier, use_life, buy_time, asset_original_value, net_asset_value, asset_head, fixed_asset_code, department, unit_working_hours, plc_ip, plc_port, del_flag, sap_asset from base_equipment + + + + + + + + insert into base_equipment + + equipment_id, + equipment_code, + equipment_name, + equipment_brand, + equipment_spec, + equipment_type_id, + equipment_type_code, + equipment_type_name, + workshop_id, + workshop_code, + workshop_name, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + workshop_section, + equipment_location, + hourly_unit_price, + equipment_barcode, + equipment_barcode_image, + manufacturer, + supplier, + use_life, + buy_time, + asset_original_value, + net_asset_value, + asset_head, + fixed_asset_code, + department, + unit_working_hours, + plc_ip, + plc_port, + del_flag, + sap_asset, + + + #{equipmentId}, + #{equipmentCode}, + #{equipmentName}, + #{equipmentBrand}, + #{equipmentSpec}, + #{equipmentTypeId}, + #{equipmentTypeCode}, + #{equipmentTypeName}, + #{workshopId}, + #{workshopCode}, + #{workshopName}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{workshopSection}, + #{equipmentLocation}, + #{hourlyUnitPrice}, + #{equipmentBarcode}, + #{equipmentBarcodeImage}, + #{manufacturer}, + #{supplier}, + #{useLife}, + #{buyTime}, + #{assetOriginalValue}, + #{netAssetValue}, + #{assetHead}, + #{fixedAssetCode}, + #{department}, + #{unitWorkingHours}, + #{plcIp}, + #{plcPort}, + #{delFlag}, + #{sapAsset}, + + + + + update base_equipment + + equipment_code = #{equipmentCode}, + equipment_name = #{equipmentName}, + equipment_brand = #{equipmentBrand}, + equipment_spec = #{equipmentSpec}, + equipment_type_id = #{equipmentTypeId}, + equipment_type_code = #{equipmentTypeCode}, + equipment_type_name = #{equipmentTypeName}, + workshop_id = #{workshopId}, + workshop_code = #{workshopCode}, + workshop_name = #{workshopName}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + workshop_section = #{workshopSection}, + equipment_location = #{equipmentLocation}, + hourly_unit_price = #{hourlyUnitPrice}, + equipment_barcode = #{equipmentBarcode}, + equipment_barcode_image = #{equipmentBarcodeImage}, + manufacturer = #{manufacturer}, + supplier = #{supplier}, + use_life = #{useLife}, + buy_time = #{buyTime}, + asset_original_value = #{assetOriginalValue}, + net_asset_value = #{netAssetValue}, + asset_head = #{assetHead}, + fixed_asset_code = #{fixedAssetCode}, + department = #{department}, + unit_working_hours = #{unitWorkingHours}, + plc_ip = #{plcIp}, + plc_port = #{plcPort}, + del_flag = #{delFlag}, + sap_asset = #{sapAsset}, + + where equipment_id = #{equipmentId} + + + + delete from base_equipment where equipment_id = #{equipmentId} + + + + delete from base_equipment where equipment_id in + + #{equipmentId} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml new file mode 100644 index 000000000..5e0a77038 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, code, plan_id, parent_code, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_detail + + + + + + + + insert into equ_plan_detail + + id, + code, + plan_id, + parent_code, + item_code, + item_name, + item_method, + item_type, + item_type_name, + item_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{planId}, + #{parentCode}, + #{itemCode}, + #{itemName}, + #{itemMethod}, + #{itemType}, + #{itemTypeName}, + #{itemRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_detail + + code = #{code}, + plan_id = #{planId}, + parent_code = #{parentCode}, + item_code = #{itemCode}, + item_name = #{itemName}, + item_method = #{itemMethod}, + item_type = #{itemType}, + item_type_name = #{itemTypeName}, + item_remark = #{itemRemark}, + 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_plan_detail where id = #{id} + + + + delete from equ_plan_detail where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml new file mode 100644 index 000000000..c5a504629 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, code, parent_code, equipment_code, equipment_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_equ + + + + + + + + insert into equ_plan_equ + + id, + code, + parent_code, + equipment_code, + equipment_name, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{parentCode}, + #{equipmentCode}, + #{equipmentName}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_equ + + code = #{code}, + parent_code = #{parentCode}, + 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_plan_equ where id = #{id} + + + + delete from equ_plan_equ where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml new file mode 100644 index 000000000..067fc5413 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, code, parent_code, detail_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_standard + + + + + + + + insert into equ_plan_standard + + id, + code, + parent_code, + detail_code, + standard_type, + standard_name, + detail_up_limit, + detail_down_limit, + detail_unit, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{code}, + #{parentCode}, + #{detailCode}, + #{standardType}, + #{standardName}, + #{detailUpLimit}, + #{detailDownLimit}, + #{detailUnit}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_standard + + code = #{code}, + parent_code = #{parentCode}, + detail_code = #{detailCode}, + standard_type = #{standardType}, + standard_name = #{standardName}, + detail_up_limit = #{detailUpLimit}, + detail_down_limit = #{detailDownLimit}, + detail_unit = #{detailUnit}, + 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_plan_standard where id = #{id} + + + + delete from equ_plan_standard where id in + + #{id} + + + \ No newline at end of file From 73d26c1f8b1afbda62a35ccd4935e0487f36b1a0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 17 Oct 2023 17:40:29 +0800 Subject: [PATCH 08/13] =?UTF-8?q?sap=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=97=B6=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/sap/controller/SapController.java | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index 8d949d067..cb5caca58 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; @@ -81,8 +82,12 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++product同步开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime = sapBomMapper.getProductMaxTime(); - if(maxTime != null){ + Date maxTime0 = sapBomMapper.getProductMaxTime(); + if(maxTime0 != null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); qo.setLaeda(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 } @@ -113,8 +118,12 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++bom同步开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime = sapBomMapper.getProductMaxTime(); - if(maxTime != null){ + Date maxTime0 = sapBomMapper.getProductMaxTime(); + if(maxTime0 != null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); qo.setAedat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 } @@ -131,7 +140,6 @@ public class SapController extends BaseController { /** * 工艺路线同步 - * @param SapRouterQuery qo * @return */ @PostMapping("/sapRouterSync") @@ -147,8 +155,12 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++工艺同步开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime = sapBomMapper.getRouteMaxTime(); - if(maxTime != null){ + Date maxTime0 = sapBomMapper.getRouteMaxTime(); + if(maxTime0 != null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); qo.setAedat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 } qo.setWerks(dateSource.get("poolName").replace("ds_",""));//工厂 @@ -227,8 +239,12 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++工作中心开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key qo.setWerks(dateSource.get("poolName").replace("ds_",""));//工厂 - Date maxTime = sapBomMapper.getMaxTime(); - if(maxTime != null){ + Date maxTime0 = sapBomMapper.getMaxTime(); + if(maxTime0 != null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); qo.setAedat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 } @@ -263,8 +279,12 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++供应商主数据开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key sapSupplierQuery.setBukrs(dateSource.get("poolName").replace("ds_",""));//工厂 - Date maxTime = sapBomMapper.getSupplierMaxTime(); - if(maxTime != null){ + Date maxTime0 = sapBomMapper.getSupplierMaxTime(); + if(maxTime0 != null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); sapSupplierQuery.setErdat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 } @@ -301,8 +321,13 @@ public class SapController extends BaseController { logger.info("++++++++++++" + dateSource.get("poolName") + "++++客户主数据开始++++++++++"); DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key sapCustom.setBukrs(dateSource.get("poolName").replace("ds_",""));//工厂 - Date maxTime = sapBomMapper.getCustomMaxTime(); - if(maxTime != null){ + Date maxTime0 = sapBomMapper.getCustomMaxTime(); + + if(maxTime0 != null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); sapCustom.setErdat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 } From 23659427c640ab008e1b5c4fdd887a3d1822e871 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 17 Oct 2023 17:54:14 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E9=A2=86=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquSpareApplyController.java | 97 ++++++++ .../com/op/device/domain/EquSpareApply.java | 220 ++++++++++++++++++ .../op/device/mapper/EquSpareApplyMapper.java | 61 +++++ .../device/service/IEquSpareApplyService.java | 60 +++++ .../impl/EquSpareApplyServiceImpl.java | 102 ++++++++ .../mapper/device/EquSpareApplyMapper.xml | 143 ++++++++++++ 6 files changed, 683 insertions(+) create mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java new file mode 100644 index 000000000..6db2647aa --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java @@ -0,0 +1,97 @@ +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; +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.device.domain.EquSpareApply; +import com.op.device.service.IEquSpareApplyService; +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 2023-10-17 + */ +@RestController +@RequestMapping("/sparePartsApplicationRecord") +public class EquSpareApplyController extends BaseController { + @Autowired + private IEquSpareApplyService equSpareApplyService; + + /** + * 查询申领记录列表 + */ + @RequiresPermissions("device:sparePartsApplicationRecord:list") + @GetMapping("/list") + public TableDataInfo list(EquSpareApply equSpareApply) { + startPage(); + List list = equSpareApplyService.selectEquSpareApplyList(equSpareApply); + return getDataTable(list); + } + + /** + * 导出申领记录列表 + */ + @RequiresPermissions("device:sparePartsApplicationRecord:export") + @Log(title = "申领记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquSpareApply equSpareApply) { + List list = equSpareApplyService.selectEquSpareApplyList(equSpareApply); + ExcelUtil util = new ExcelUtil(EquSpareApply.class); + util.exportExcel(response, list, "申领记录数据"); + } + + /** + * 获取申领记录详细信息 + */ + @RequiresPermissions("device:sparePartsApplicationRecord:query") + @GetMapping(value = "/{applyId}") + public AjaxResult getInfo(@PathVariable("applyId") String applyId) { + return success(equSpareApplyService.selectEquSpareApplyByApplyId(applyId)); + } + + /** + * 新增申领记录 + */ + @RequiresPermissions("device:sparePartsApplicationRecord:add") + @Log(title = "申领记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquSpareApply equSpareApply) { + return toAjax(equSpareApplyService.insertEquSpareApply(equSpareApply)); + } + + /** + * 修改申领记录 + */ + @RequiresPermissions("device:sparePartsApplicationRecord:edit") + @Log(title = "申领记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquSpareApply equSpareApply) { + return toAjax(equSpareApplyService.updateEquSpareApply(equSpareApply)); + } + + /** + * 删除申领记录 + */ + @RequiresPermissions("device:sparePartsApplicationRecord:remove") + @Log(title = "申领记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{applyIds}") + public AjaxResult remove(@PathVariable String[] applyIds) { + return toAjax(equSpareApplyService.deleteEquSpareApplyByApplyIds(applyIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java new file mode 100644 index 000000000..183bf6a87 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java @@ -0,0 +1,220 @@ +package com.op.device.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_spare_apply + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquSpareApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String applyId; + + /** 出库单号 */ + @Excel(name = "出库单号") + private String applyCode; + + /** 备品备件编码 */ + @Excel(name = "备品备件编码") + private String spareCode; + + /** 备品备件名称 */ + @Excel(name = "备品备件名称") + private String spareName; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String spareModel; + + /** 数量 */ + @Excel(name = "数量") + private Long spareQuantity; + + /** 使用组线 */ + @Excel(name = "使用组线") + private String spareGroupLine; + + /** 使用设备 */ + @Excel(name = "使用设备") + private String spareUseEquipment; + + /** 领用时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "领用时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date applyTime; + + /** 申领人 */ + @Excel(name = "申领人") + private String applyPeople; + + /** 批准人 */ + @Excel(name = "批准人") + private String applyApprovePeople; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + /** 工厂号 */ + @Excel(name = "工厂号") + private String factoryCode; + + public void setApplyId(String applyId) { + this.applyId = applyId; + } + + public String getApplyId() { + return applyId; + } + public void setApplyCode(String applyCode) { + this.applyCode = applyCode; + } + + public String getApplyCode() { + return applyCode; + } + public void setSpareCode(String spareCode) { + this.spareCode = spareCode; + } + + public String getSpareCode() { + return spareCode; + } + public void setSpareName(String spareName) { + this.spareName = spareName; + } + + public String getSpareName() { + return spareName; + } + public void setSpareModel(String spareModel) { + this.spareModel = spareModel; + } + + public String getSpareModel() { + return spareModel; + } + public void setSpareQuantity(Long spareQuantity) { + this.spareQuantity = spareQuantity; + } + + public Long getSpareQuantity() { + return spareQuantity; + } + public void setSpareGroupLine(String spareGroupLine) { + this.spareGroupLine = spareGroupLine; + } + + public String getSpareGroupLine() { + return spareGroupLine; + } + public void setSpareUseEquipment(String spareUseEquipment) { + this.spareUseEquipment = spareUseEquipment; + } + + public String getSpareUseEquipment() { + return spareUseEquipment; + } + public void setApplyTime(Date applyTime) { + this.applyTime = applyTime; + } + + public Date getApplyTime() { + return applyTime; + } + public void setApplyPeople(String applyPeople) { + this.applyPeople = applyPeople; + } + + public String getApplyPeople() { + return applyPeople; + } + public void setApplyApprovePeople(String applyApprovePeople) { + this.applyApprovePeople = applyApprovePeople; + } + + public String getApplyApprovePeople() { + return applyApprovePeople; + } + 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; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("applyId", getApplyId()) + .append("applyCode", getApplyCode()) + .append("spareCode", getSpareCode()) + .append("spareName", getSpareName()) + .append("spareModel", getSpareModel()) + .append("spareQuantity", getSpareQuantity()) + .append("spareGroupLine", getSpareGroupLine()) + .append("spareUseEquipment", getSpareUseEquipment()) + .append("applyTime", getApplyTime()) + .append("applyPeople", getApplyPeople()) + .append("applyApprovePeople", getApplyApprovePeople()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java new file mode 100644 index 000000000..e9b74390d --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquSpareApply; + +/** + * 申领记录Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquSpareApplyMapper { + /** + * 查询申领记录 + * + * @param applyId 申领记录主键 + * @return 申领记录 + */ + public EquSpareApply selectEquSpareApplyByApplyId(String applyId); + + /** + * 查询申领记录列表 + * + * @param equSpareApply 申领记录 + * @return 申领记录集合 + */ + public List selectEquSpareApplyList(EquSpareApply equSpareApply); + + /** + * 新增申领记录 + * + * @param equSpareApply 申领记录 + * @return 结果 + */ + public int insertEquSpareApply(EquSpareApply equSpareApply); + + /** + * 修改申领记录 + * + * @param equSpareApply 申领记录 + * @return 结果 + */ + public int updateEquSpareApply(EquSpareApply equSpareApply); + + /** + * 删除申领记录 + * + * @param applyId 申领记录主键 + * @return 结果 + */ + public int deleteEquSpareApplyByApplyId(String applyId); + + /** + * 批量删除申领记录 + * + * @param applyIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquSpareApplyByApplyIds(String[] applyIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java new file mode 100644 index 000000000..27569b554 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.EquSpareApply; + +/** + * 申领记录Service接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface IEquSpareApplyService { + /** + * 查询申领记录 + * + * @param applyId 申领记录主键 + * @return 申领记录 + */ + public EquSpareApply selectEquSpareApplyByApplyId(String applyId); + + /** + * 查询申领记录列表 + * + * @param equSpareApply 申领记录 + * @return 申领记录集合 + */ + public List selectEquSpareApplyList(EquSpareApply equSpareApply); + + /** + * 新增申领记录 + * + * @param equSpareApply 申领记录 + * @return 结果 + */ + public int insertEquSpareApply(EquSpareApply equSpareApply); + + /** + * 修改申领记录 + * + * @param equSpareApply 申领记录 + * @return 结果 + */ + public int updateEquSpareApply(EquSpareApply equSpareApply); + + /** + * 批量删除申领记录 + * + * @param applyIds 需要删除的申领记录主键集合 + * @return 结果 + */ + public int deleteEquSpareApplyByApplyIds(String[] applyIds); + + /** + * 删除申领记录信息 + * + * @param applyId 申领记录主键 + * @return 结果 + */ + public int deleteEquSpareApplyByApplyId(String applyId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java new file mode 100644 index 000000000..277254c8d --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -0,0 +1,102 @@ +package com.op.device.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.device.mapper.EquSpareApplyMapper; +import com.op.device.domain.EquSpareApply; +import com.op.device.service.IEquSpareApplyService; + +/** + * 申领记录Service业务层处理 + * + * @author Open Platform + * @date 2023-10-17 + */ +@Service +public class EquSpareApplyServiceImpl implements IEquSpareApplyService { + @Autowired + private EquSpareApplyMapper equSpareApplyMapper; + + /** + * 查询申领记录 + * + * @param applyId 申领记录主键 + * @return 申领记录 + */ + @Override + @DS("#header.poolName") + public EquSpareApply selectEquSpareApplyByApplyId(String applyId) { + return equSpareApplyMapper.selectEquSpareApplyByApplyId(applyId); + } + + /** + * 查询申领记录列表 + * + * @param equSpareApply 申领记录 + * @return 申领记录 + */ + @Override + @DS("#header.poolName") + public List selectEquSpareApplyList(EquSpareApply equSpareApply) { + return equSpareApplyMapper.selectEquSpareApplyList(equSpareApply); + } + + /** + * 新增申领记录 + * + * @param equSpareApply 申领记录 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertEquSpareApply(EquSpareApply equSpareApply) { + equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); + equSpareApply.setCreateTime(DateUtils.getNowDate()); + equSpareApply.setCreateBy(SecurityUtils.getUsername()); + return equSpareApplyMapper.insertEquSpareApply(equSpareApply); + } + + /** + * 修改申领记录 + * + * @param equSpareApply 申领记录 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquSpareApply(EquSpareApply equSpareApply) { + equSpareApply.setUpdateTime(DateUtils.getNowDate()); + equSpareApply.setUpdateBy(SecurityUtils.getUsername()); + return equSpareApplyMapper.updateEquSpareApply(equSpareApply); + } + + /** + * 批量删除申领记录 + * + * @param applyIds 需要删除的申领记录主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquSpareApplyByApplyIds(String[] applyIds) { + return equSpareApplyMapper.deleteEquSpareApplyByApplyIds(applyIds); + } + + /** + * 删除申领记录信息 + * + * @param applyId 申领记录主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquSpareApplyByApplyId(String applyId) { + return equSpareApplyMapper.deleteEquSpareApplyByApplyId(applyId); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml new file mode 100644 index 000000000..3ba313757 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select apply_id, apply_code, spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_spare_apply + + + + + + + + insert into equ_spare_apply + + apply_id, + apply_code, + spare_code, + spare_name, + spare_model, + spare_quantity, + spare_group_line, + spare_use_equipment, + apply_time, + apply_people, + apply_approve_people, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + factory_code, + + + #{applyId}, + #{applyCode}, + #{spareCode}, + #{spareName}, + #{spareModel}, + #{spareQuantity}, + #{spareGroupLine}, + #{spareUseEquipment}, + #{applyTime}, + #{applyPeople}, + #{applyApprovePeople}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + + + + + update equ_spare_apply + + apply_code = #{applyCode}, + spare_code = #{spareCode}, + spare_name = #{spareName}, + spare_model = #{spareModel}, + spare_quantity = #{spareQuantity}, + spare_group_line = #{spareGroupLine}, + spare_use_equipment = #{spareUseEquipment}, + apply_time = #{applyTime}, + apply_people = #{applyPeople}, + apply_approve_people = #{applyApprovePeople}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + + where apply_id = #{applyId} + + + + delete from equ_spare_apply where apply_id = #{applyId} + + + + delete from equ_spare_apply where apply_id in + + #{applyId} + + + \ No newline at end of file From c78f1542edbd296f7aa68af390a60f73bb215dc1 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 18 Oct 2023 14:31:34 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E9=A2=86=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/EquSpareApply.java | 35 +++++++++++++++++++ .../impl/EquSpareApplyServiceImpl.java | 9 +++++ .../mapper/device/EquSpareApplyMapper.xml | 22 +++++++----- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java index 183bf6a87..fc645678f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java @@ -1,6 +1,8 @@ package com.op.device.domain; 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; @@ -79,6 +81,39 @@ public class EquSpareApply extends BaseEntity { @Excel(name = "工厂号") private String factoryCode; + // 创建日期范围list + private List applyTimeArray; + + // 创建日期开始 + private String applyTimeStart; + + // 创建日期结束 + private String applyTimeEnd; + + public List getApplyTimeArray() { + return applyTimeArray; + } + + public void setApplyTimeArray(List applyTimeArray) { + this.applyTimeArray = applyTimeArray; + } + + public String getApplyTimeStart() { + return applyTimeStart; + } + + public void setApplyTimeStart(String createTimeStart) { + this.applyTimeStart = createTimeStart; + } + + public String getApplyTimeEnd() { + return applyTimeEnd; + } + + public void setApplyTimeEnd(String applyTimeEnd) { + this.applyTimeEnd = applyTimeEnd; + } + public void setApplyId(String applyId) { this.applyId = applyId; } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java index 277254c8d..11a3b01d6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -1,5 +1,6 @@ package com.op.device.service.impl; +import java.text.SimpleDateFormat; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; @@ -44,6 +45,14 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { @Override @DS("#header.poolName") public List selectEquSpareApplyList(EquSpareApply equSpareApply) { + if (equSpareApply.getApplyTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equSpareApply.getApplyTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equSpareApply.setApplyTimeStart(formatter.format(equSpareApply.getApplyTimeArray().get(0))); + equSpareApply.setApplyTimeEnd(formatter.format(equSpareApply.getApplyTimeArray().get(1))); + } + } return equSpareApplyMapper.selectEquSpareApplyList(equSpareApply); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml index 3ba313757..c2f28cb46 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml @@ -34,26 +34,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From a10b915de3921c159b4e5248453eaca644291d77 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 18 Oct 2023 16:21:49 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=94=B9=E5=90=8D=E5=AD=97+=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/EquPlanController.java | 8 +- .../controller/EquRepairOrderController.java | 110 ++++++++ .../{BaseEquipment.java => EquEquipment.java} | 2 +- .../com/op/device/domain/EquRepairOrder.java | 244 ++++++++++++++++++ ...entMapper.java => EquEquipmentMapper.java} | 16 +- .../device/mapper/EquRepairOrderMapper.java | 60 +++++ .../op/device/service/IEquPlanService.java | 6 +- .../service/IEquRepairOrderService.java | 71 +++++ .../service/impl/EquPlanServiceImpl.java | 12 +- .../impl/EquRepairOrderServiceImpl.java | 114 ++++++++ ...pmentMapper.xml => EquEquipmentMapper.xml} | 22 +- .../mapper/device/EquRepairOrderMapper.xml | 152 +++++++++++ 12 files changed, 784 insertions(+), 33 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java rename op-modules/op-device/src/main/java/com/op/device/domain/{BaseEquipment.java => EquEquipment.java} (99%) create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java rename op-modules/op-device/src/main/java/com/op/device/mapper/{BaseEquipmentMapper.java => EquEquipmentMapper.java} (63%) create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java rename op-modules/op-device/src/main/resources/mapper/device/{BaseEquipmentMapper.xml => EquEquipmentMapper.xml} (95%) create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java index a2c3482aa..b614271fa 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -3,7 +3,7 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.op.device.domain.BaseEquipment; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquPlanEqu; import com.op.device.domain.dto.InspectionPlanDTO; import com.op.device.domain.vo.InspectionPlanVO; @@ -50,14 +50,14 @@ public class EquPlanController extends BaseController { /** * 获取设备信息list - * @param baseEquipment + * @param equEquipment * @return */ @RequiresPermissions("device:plan:list") @GetMapping("/getEquList") - public TableDataInfo getEquList(BaseEquipment baseEquipment) { + public TableDataInfo getEquList(EquEquipment equEquipment) { startPage(); - List list = equPlanService.getEquList(baseEquipment); + List list = equPlanService.getEquList(equEquipment); return getDataTable(list); } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java new file mode 100644 index 000000000..f6efdf790 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java @@ -0,0 +1,110 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.device.domain.EquEquipment; +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.device.domain.EquRepairOrder; +import com.op.device.service.IEquRepairOrderService; +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 2023-10-16 + */ +@RestController +@RequestMapping("/faultReport") +public class EquRepairOrderController extends BaseController { + @Autowired + private IEquRepairOrderService equRepairOrderService; + + /** + * 查询故障报修列表 + */ + @RequiresPermissions("device:faultReport:list") + @GetMapping("/list") + public TableDataInfo list(EquRepairOrder equRepairOrder) { + startPage(); + List list = equRepairOrderService.selectEquRepairOrderList(equRepairOrder); + return getDataTable(list); + } + + /** + * 导出故障报修列表 + */ + @RequiresPermissions("device:faultReport:export") + @Log(title = "故障报修", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquRepairOrder equRepairOrder) { + List list = equRepairOrderService.selectEquRepairOrderList(equRepairOrder); + ExcelUtil util = new ExcelUtil(EquRepairOrder.class); + util.exportExcel(response, list, "故障报修数据"); + } + + /** + * 获取故障报修详细信息 + */ + @RequiresPermissions("device:faultReport:query") + @GetMapping(value = "/{orderId}") + public AjaxResult getInfo(@PathVariable("orderId") String orderId) { + return success(equRepairOrderService.selectEquRepairOrderByOrderId(orderId)); + } + + /** + * 新增故障报修 + */ + @RequiresPermissions("device:faultReport:add") + @Log(title = "故障报修", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquRepairOrder equRepairOrder) { + return toAjax(equRepairOrderService.insertEquRepairOrder(equRepairOrder)); + } + + /** + * 修改故障报修 + */ + @RequiresPermissions("device:faultReport:edit") + @Log(title = "故障报修", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquRepairOrder equRepairOrder) { + return toAjax(equRepairOrderService.updateEquRepairOrder(equRepairOrder)); + } + + /** + * 删除故障报修 + */ + @RequiresPermissions("device:faultReport:remove") + @Log(title = "故障报修", businessType = BusinessType.DELETE) + @DeleteMapping("/{orderIds}") + public AjaxResult remove(@PathVariable String[] orderIds) { + return toAjax(equRepairOrderService.deleteEquRepairOrderByOrderIds(orderIds)); + } + + /** + * 查询设备编码列表 + */ + @GetMapping("/getEquipmentList") + public TableDataInfo getEquipmentList(EquEquipment equEquipment) { + startPage(); + List list = equRepairOrderService.selectEquEquipmentList(equEquipment); + return getDataTable(list); + } + +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java similarity index 99% rename from op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java rename to op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java index c1e67dd2b..5566f4e4c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/BaseEquipment.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java @@ -12,7 +12,7 @@ import com.op.common.core.web.domain.BaseEntity; * @author Open Platform * @date 2023-10-17 */ -public class BaseEquipment extends BaseEntity { +public class EquEquipment extends BaseEntity { private static final long serialVersionUID = 1L; /** 设备ID */ diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java new file mode 100644 index 000000000..4ecd84b10 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java @@ -0,0 +1,244 @@ +package com.op.device.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_repair_order + * + * @author Open Platform + * @date 2023-10-16 + */ +public class EquRepairOrder extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String orderId; + + /** 报修单号 */ + @Excel(name = "报修单号") + private String orderCode; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 故障描述 */ + @Excel(name = "故障描述") + private String orderDesc; + + /** 故障时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "故障时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date orderBreakdownTime; + + /** 报修来源 */ + @Excel(name = "报修来源") + private String orderSource; + + /** 报修时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date orderTime; + + /** 是否立即处理 */ + @Excel(name = "是否立即处理") + private String orderHandle; + + /** 报修人 */ + @Excel(name = "报修人") + private String orderRepairman; + + /** 联系方式 */ + @Excel(name = "联系方式") + private String orderConnection; + + /** 处理状态 */ + @Excel(name = "处理状态") + private String orderStatus; + + /** 关联计划 */ + @Excel(name = "关联计划") + private String orderRelevance; + + /** 故障图片 */ + @Excel(name = "故障图片") + private String orderPicture; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + /** 创建人 */ + @Excel(name = "创建人") + private String craeteBy; + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOrderId() { + return orderId; + } + 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 setOrderDesc(String orderDesc) { + this.orderDesc = orderDesc; + } + + public String getOrderDesc() { + return orderDesc; + } + public void setOrderBreakdownTime(Date orderBreakdownTime) { + this.orderBreakdownTime = orderBreakdownTime; + } + + public Date getOrderBreakdownTime() { + return orderBreakdownTime; + } + public void setOrderSource(String orderSource) { + this.orderSource = orderSource; + } + + public String getOrderSource() { + return orderSource; + } + public void setOrderTime(Date orderTime) { + this.orderTime = orderTime; + } + + public Date getOrderTime() { + return orderTime; + } + public void setOrderHandle(String orderHandle) { + this.orderHandle = orderHandle; + } + + public String getOrderHandle() { + return orderHandle; + } + public void setOrderRepairman(String orderRepairman) { + this.orderRepairman = orderRepairman; + } + + public String getOrderRepairman() { + return orderRepairman; + } + public void setOrderConnection(String orderConnection) { + this.orderConnection = orderConnection; + } + + public String getOrderConnection() { + return orderConnection; + } + public void setOrderStatus(String orderStatus) { + this.orderStatus = orderStatus; + } + + public String getOrderStatus() { + return orderStatus; + } + public void setOrderRelevance(String orderRelevance) { + this.orderRelevance = orderRelevance; + } + + public String getOrderRelevance() { + return orderRelevance; + } + public void setOrderPicture(String orderPicture) { + this.orderPicture = orderPicture; + } + + public String getOrderPicture() { + return orderPicture; + } + 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; + } + public void setCraeteBy(String craeteBy) { + this.craeteBy = craeteBy; + } + + public String getCraeteBy() { + return craeteBy; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("orderId", getOrderId()) + .append("orderCode", getOrderCode()) + .append("equipmentCode", getEquipmentCode()) + .append("orderDesc", getOrderDesc()) + .append("orderBreakdownTime", getOrderBreakdownTime()) + .append("orderSource", getOrderSource()) + .append("orderTime", getOrderTime()) + .append("orderHandle", getOrderHandle()) + .append("orderRepairman", getOrderRepairman()) + .append("orderConnection", getOrderConnection()) + .append("orderStatus", getOrderStatus()) + .append("orderRelevance", getOrderRelevance()) + .append("orderPicture", getOrderPicture()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("craeteBy", getCraeteBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java similarity index 63% rename from op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java rename to op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java index 759b0d0d6..3c49c0505 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/BaseEquipmentMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java @@ -1,6 +1,6 @@ package com.op.device.mapper; -import com.op.device.domain.BaseEquipment; +import com.op.device.domain.EquEquipment; import java.util.List; @@ -10,14 +10,14 @@ import java.util.List; * @author Open Platform * @date 2023-10-17 */ -public interface BaseEquipmentMapper { +public interface EquEquipmentMapper { /** * 查询设备管理 * * @param equipmentId 设备管理主键 * @return 设备管理 */ - public BaseEquipment selectBaseEquipmentByEquipmentId(Long equipmentId); + public EquEquipment selectEquEquipmentByEquipmentId(Long equipmentId); /** * 查询设备管理列表 @@ -25,7 +25,7 @@ public interface BaseEquipmentMapper { * @param baseEquipment 设备管理 * @return 设备管理集合 */ - public List selectBaseEquipmentList(BaseEquipment baseEquipment); + public List selectEquEquipmentList(EquEquipment baseEquipment); /** * 新增设备管理 @@ -33,7 +33,7 @@ public interface BaseEquipmentMapper { * @param baseEquipment 设备管理 * @return 结果 */ - public int insertBaseEquipment(BaseEquipment baseEquipment); + public int insertEquEquipment(EquEquipment baseEquipment); /** * 修改设备管理 @@ -41,7 +41,7 @@ public interface BaseEquipmentMapper { * @param baseEquipment 设备管理 * @return 结果 */ - public int updateBaseEquipment(BaseEquipment baseEquipment); + public int updateEquEquipment(EquEquipment baseEquipment); /** * 删除设备管理 @@ -49,7 +49,7 @@ public interface BaseEquipmentMapper { * @param equipmentId 设备管理主键 * @return 结果 */ - public int deleteBaseEquipmentByEquipmentId(Long equipmentId); + public int deleteEquEquipmentByEquipmentId(Long equipmentId); /** * 批量删除设备管理 @@ -57,5 +57,5 @@ public interface BaseEquipmentMapper { * @param equipmentIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds); + public int deleteEquEquipmentByEquipmentIds(Long[] equipmentIds); } \ No newline at end of file diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java new file mode 100644 index 000000000..50e3248c3 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java @@ -0,0 +1,60 @@ +package com.op.device.mapper; + +import java.util.List; +import com.op.device.domain.EquRepairOrder; + +/** + * 故障报修Mapper接口 + * + * @author Open Platform + * @date 2023-10-16 + */ +public interface EquRepairOrderMapper { + /** + * 查询故障报修 + * + * @param orderId 故障报修主键 + * @return 故障报修 + */ + public EquRepairOrder selectEquRepairOrderByOrderId(String orderId); + + /** + * 查询故障报修列表 + * + * @param equRepairOrder 故障报修 + * @return 故障报修集合 + */ + public List selectEquRepairOrderList(EquRepairOrder equRepairOrder); + + /** + * 新增故障报修 + * + * @param equRepairOrder 故障报修 + * @return 结果 + */ + public int insertEquRepairOrder(EquRepairOrder equRepairOrder); + + /** + * 修改故障报修 + * + * @param equRepairOrder 故障报修 + * @return 结果 + */ + public int updateEquRepairOrder(EquRepairOrder equRepairOrder); + + /** + * 删除故障报修 + * + * @param orderId 故障报修主键 + * @return 结果 + */ + public int deleteEquRepairOrderByOrderId(String orderId); + + /** + * 批量删除故障报修 + * + * @param orderIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquRepairOrderByOrderIds(String[] orderIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java index 8f3239079..ae75d58e7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java @@ -3,7 +3,7 @@ package com.op.device.service; import java.util.List; import com.op.common.core.web.domain.AjaxResult; -import com.op.device.domain.BaseEquipment; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquPlan; import com.op.device.domain.EquPlanEqu; import com.op.device.domain.dto.InspectionPlanDTO; @@ -66,10 +66,10 @@ public interface IEquPlanService { /** * 获取设备信息list - * @param baseEquipment + * @param equEquipment * @return */ - List getEquList(BaseEquipment baseEquipment); + List getEquList(EquEquipment equEquipment); /** * 处理计划-设备信息 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java new file mode 100644 index 000000000..9fa7224a6 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java @@ -0,0 +1,71 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.device.domain.EquEquipment; +import com.op.device.domain.EquEquipment; +import com.op.device.domain.EquRepairOrder; + +/** + * 故障报修Service接口 + * + * @author Open Platform + * @date 2023-10-16 + */ +public interface IEquRepairOrderService { + /** + * 查询故障报修 + * + * @param orderId 故障报修主键 + * @return 故障报修 + */ + public EquRepairOrder selectEquRepairOrderByOrderId(String orderId); + + /** + * 查询故障报修列表 + * + * @param equRepairOrder 故障报修 + * @return 故障报修集合 + */ + public List selectEquRepairOrderList(EquRepairOrder equRepairOrder); + + /** + * 新增故障报修 + * + * @param equRepairOrder 故障报修 + * @return 结果 + */ + public int insertEquRepairOrder(EquRepairOrder equRepairOrder); + + /** + * 修改故障报修 + * + * @param equRepairOrder 故障报修 + * @return 结果 + */ + public int updateEquRepairOrder(EquRepairOrder equRepairOrder); + + /** + * 批量删除故障报修 + * + * @param orderIds 需要删除的故障报修主键集合 + * @return 结果 + */ + public int deleteEquRepairOrderByOrderIds(String[] orderIds); + + /** + * 删除故障报修信息 + * + * @param orderId 故障报修主键 + * @return 结果 + */ + public int deleteEquRepairOrderByOrderId(String orderId); + + /** + * 查询设备列表 + * + * @param equEquipment 故障报修主键 + * @return 结果 + */ + List selectEquEquipmentList(EquEquipment equEquipment); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index bc276ae5e..12dddeb2c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -6,11 +6,11 @@ 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.BaseEquipment; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquPlanEqu; import com.op.device.domain.dto.InspectionPlanDTO; import com.op.device.domain.vo.InspectionPlanVO; -import com.op.device.mapper.BaseEquipmentMapper; +import com.op.device.mapper.EquEquipmentMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.mapper.EquPlanMapper; @@ -28,7 +28,7 @@ public class EquPlanServiceImpl implements IEquPlanService { @Autowired private EquPlanMapper equPlanMapper; @Autowired - private BaseEquipmentMapper baseEquipmentMapper; + private EquEquipmentMapper equEquipmentMapper; /** * 查询计划 @@ -122,13 +122,13 @@ public class EquPlanServiceImpl implements IEquPlanService { /** * 获取设备信息list - * @param baseEquipment + * @param equEquipment * @return */ @Override @DS("#header.poolName") - public List getEquList(BaseEquipment baseEquipment) { - return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment); + public List getEquList(EquEquipment equEquipment) { + return equEquipmentMapper.selectEquEquipmentList(equEquipment); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java new file mode 100644 index 000000000..b2b1ea358 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -0,0 +1,114 @@ +package com.op.device.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import com.op.device.domain.EquEquipment; +import com.op.device.mapper.EquEquipmentMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquRepairOrderMapper; +import com.op.device.domain.EquRepairOrder; +import com.op.device.service.IEquRepairOrderService; + +/** + * 故障报修Service业务层处理 + * + * @author Open Platform + * @date 2023-10-16 + */ +@Service +public class EquRepairOrderServiceImpl implements IEquRepairOrderService { + @Autowired + private EquRepairOrderMapper equRepairOrderMapper; + + @Autowired + private EquEquipmentMapper equEquipmentMapper; + + /** + * 查询故障报修 + * + * @param orderId 故障报修主键 + * @return 故障报修 + */ + @Override + @DS("#header.poolName") + public EquRepairOrder selectEquRepairOrderByOrderId(String orderId) { + return equRepairOrderMapper.selectEquRepairOrderByOrderId(orderId); + } + + /** + * 查询故障报修列表 + * + * @param equRepairOrder 故障报修 + * @return 故障报修 + */ + @Override + @DS("#header.poolName") + public List selectEquRepairOrderList(EquRepairOrder equRepairOrder) { + return equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder); + } + + /** + * 新增故障报修 + * + * @param equRepairOrder 故障报修 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertEquRepairOrder(EquRepairOrder equRepairOrder) { + equRepairOrder.setCreateTime(DateUtils.getNowDate()); + return equRepairOrderMapper.insertEquRepairOrder(equRepairOrder); + } + + /** + * 修改故障报修 + * + * @param equRepairOrder 故障报修 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquRepairOrder(EquRepairOrder equRepairOrder) { + equRepairOrder.setUpdateTime(DateUtils.getNowDate()); + return equRepairOrderMapper.updateEquRepairOrder(equRepairOrder); + } + + /** + * 批量删除故障报修 + * + * @param orderIds 需要删除的故障报修主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquRepairOrderByOrderIds(String[] orderIds) { + return equRepairOrderMapper.deleteEquRepairOrderByOrderIds(orderIds); + } + + /** + * 删除故障报修信息 + * + * @param orderId 故障报修主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquRepairOrderByOrderId(String orderId) { + return equRepairOrderMapper.deleteEquRepairOrderByOrderId(orderId); + } + + /** + * 查询故障报修列表 + * + * @param equEquipment 故障报修 + * @return 故障报修 + */ + @Override + @DS("#header.poolName") + public List selectEquEquipmentList(EquEquipment equEquipment) { + return equEquipmentMapper.selectEquEquipmentList(equEquipment); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml similarity index 95% rename from op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml rename to op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml index 61664188b..63a1e0067 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/BaseEquipmentMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -47,12 +47,12 @@ - + select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price, equipment_barcode, equipment_barcode_image, manufacturer, supplier, use_life, buy_time, asset_original_value, net_asset_value, asset_head, fixed_asset_code, department, unit_working_hours, plc_ip, plc_port, del_flag, sap_asset from base_equipment - + and equipment_code like concat('%', #{equipmentCode}, '%') and equipment_name like concat('%', #{equipmentName}, '%') @@ -90,12 +90,12 @@ - + where equipment_id = #{equipmentId} - + insert into base_equipment equipment_id, @@ -183,7 +183,7 @@ - + update base_equipment equipment_code = #{equipmentCode}, @@ -229,11 +229,11 @@ where equipment_id = #{equipmentId} - + delete from base_equipment where equipment_id = #{equipmentId} - + delete from base_equipment where equipment_id in #{equipmentId} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml new file mode 100644 index 000000000..2cbce4e02 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select order_id, order_code, equipment_code, order_desc, order_breakdown_time, order_source, order_time, order_handle, order_repairman, order_connection, order_status, order_relevance, order_picture, attr1, attr2, attr3, del_flag, craete_by, create_time, update_by, update_time from equ_repair_order + + + + + + + + insert into equ_repair_order + + order_id, + order_code, + equipment_code, + order_desc, + order_breakdown_time, + order_source, + order_time, + order_handle, + order_repairman, + order_connection, + order_status, + order_relevance, + order_picture, + attr1, + attr2, + attr3, + del_flag, + craete_by, + create_time, + update_by, + update_time, + + + #{orderId}, + #{orderCode}, + #{equipmentCode}, + #{orderDesc}, + #{orderBreakdownTime}, + #{orderSource}, + #{orderTime}, + #{orderHandle}, + #{orderRepairman}, + #{orderConnection}, + #{orderStatus}, + #{orderRelevance}, + #{orderPicture}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{craeteBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_repair_order + + order_code = #{orderCode}, + equipment_code = #{equipmentCode}, + order_desc = #{orderDesc}, + order_breakdown_time = #{orderBreakdownTime}, + order_source = #{orderSource}, + order_time = #{orderTime}, + order_handle = #{orderHandle}, + order_repairman = #{orderRepairman}, + order_connection = #{orderConnection}, + order_status = #{orderStatus}, + order_relevance = #{orderRelevance}, + order_picture = #{orderPicture}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + craete_by = #{craeteBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where order_id = #{orderId} + + + + delete from equ_repair_order where order_id = #{orderId} + + + + delete from equ_repair_order where order_id in + + #{orderId} + + + + \ No newline at end of file From e56dc7446b9113c9390651902c2a9c2135e72248 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Wed, 18 Oct 2023 16:21:53 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/EquPlanController.java | 172 +++++------ .../com/op/device/domain/EquCheckItem.java | 10 + .../op/device/domain/EquCheckItemDetail.java | 30 ++ .../java/com/op/device/domain/EquPlan.java | 21 ++ .../java/com/op/device/domain/EquPlanEqu.java | 20 ++ .../device/domain/dto/InspectionPlanDTO.java | 23 ++ .../mapper/EquCheckItemDetailMapper.java | 7 + .../op/device/mapper/EquCheckItemMapper.java | 7 + .../com/op/device/mapper/EquPlanMapper.java | 2 + .../com/op/device/mapper/SysUserMapper.java | 61 ++++ .../op/device/service/IEquPlanService.java | 8 +- .../service/impl/EquPlanServiceImpl.java | 272 ++++++++++-------- .../device/EquCheckItemDetailMapper.xml | 5 + .../mapper/device/EquCheckItemMapper.xml | 7 +- .../resources/mapper/device/SysUserMapper.xml | 130 +++++++++ 15 files changed, 578 insertions(+), 197 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/SysUserMapper.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/SysUserMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java index a2c3482aa..a884e99a5 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -28,98 +28,110 @@ import com.op.common.core.web.page.TableDataInfo; /** * 计划Controller - * + * * @author Open Platform * @date 2023-10-16 */ @RestController @RequestMapping("/plan") public class EquPlanController extends BaseController { - @Autowired - private IEquPlanService equPlanService; + @Autowired + private IEquPlanService equPlanService; - /** - * 处理计划-设备信息 - * @param equPlanEquList - * @return - */ - @PostMapping("/formatEquItem") - public AjaxResult formatEquItem(@RequestBody List equPlanEquList) { - return equPlanService.formatEquItem(equPlanEquList); - } + /** + * 获取人员信息list + * + * @return + */ + @GetMapping("/getPersonList") + public AjaxResult getPersonList() { + return equPlanService.getPersonList(); + } - /** - * 获取设备信息list - * @param baseEquipment - * @return - */ - @RequiresPermissions("device:plan:list") - @GetMapping("/getEquList") - public TableDataInfo getEquList(BaseEquipment baseEquipment) { - startPage(); - List list = equPlanService.getEquList(baseEquipment); - return getDataTable(list); - } + /** + * 处理计划-设备信息 + * + * @param equPlanEquList + * @return + */ + @PostMapping("/formatEquItem") + public AjaxResult formatEquItem(@RequestBody List equPlanEquList) { + return equPlanService.formatEquItem(equPlanEquList); + } - /** - * 查询计划列表 - */ - @RequiresPermissions("device:plan:list") - @GetMapping("/list") - public TableDataInfo list(EquPlan equPlan) { - startPage(); - List list = equPlanService.selectEquPlanList(equPlan); - return getDataTable(list); - } + /** + * 获取设备信息list + * + * @param baseEquipment + * @return + */ + @RequiresPermissions("device:plan:list") + @GetMapping("/getEquList") + public TableDataInfo getEquList(BaseEquipment baseEquipment) { + startPage(); + List list = equPlanService.getEquList(baseEquipment); + return getDataTable(list); + } - /** - * 导出计划列表 - */ - @RequiresPermissions("device:plan:export") - @Log(title = "计划", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EquPlan equPlan) { - List list = equPlanService.selectEquPlanList(equPlan); - ExcelUtil util = new ExcelUtil(EquPlan.class); - util.exportExcel(response, list, "计划数据"); - } + /** + * 查询计划列表 + */ + @RequiresPermissions("device:plan:list") + @GetMapping("/list") + public TableDataInfo list(EquPlan equPlan) { + startPage(); + List list = equPlanService.selectEquPlanList(equPlan); + return getDataTable(list); + } - /** - * 获取计划详细信息 - */ - @RequiresPermissions("device:plan:query") - @GetMapping(value = "/{planId}") - public AjaxResult getInfo(@PathVariable("planId") String planId) { - return success(equPlanService.selectEquPlanByPlanId(planId)); - } + /** + * 导出计划列表 + */ + @RequiresPermissions("device:plan:export") + @Log(title = "计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquPlan equPlan) { + List list = equPlanService.selectEquPlanList(equPlan); + ExcelUtil util = new ExcelUtil(EquPlan.class); + util.exportExcel(response, list, "计划数据"); + } - /** - * 新增计划 - */ - @RequiresPermissions("device:plan:add") - @Log(title = "计划", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody EquPlan equPlan) { - return toAjax(equPlanService.insertEquPlan(equPlan)); - } + /** + * 获取计划详细信息 + */ + @RequiresPermissions("device:plan:query") + @GetMapping(value = "/{planId}") + public AjaxResult getInfo(@PathVariable("planId") String planId) { + return success(equPlanService.selectEquPlanByPlanId(planId)); + } - /** - * 修改计划 - */ - @RequiresPermissions("device:plan:edit") - @Log(title = "计划", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EquPlan equPlan) { - return toAjax(equPlanService.updateEquPlan(equPlan)); - } + /** + * 新增计划 + */ + @RequiresPermissions("device:plan:add") + @Log(title = "计划", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquPlan equPlan) { + return equPlanService.insertEquPlan(equPlan); + } - /** - * 删除计划 - */ - @RequiresPermissions("device:plan:remove") - @Log(title = "计划", businessType = BusinessType.DELETE) - @DeleteMapping("/{planIds}") - public AjaxResult remove(@PathVariable String[] planIds) { - return toAjax(equPlanService.deleteEquPlanByPlanIds(planIds)); - } + /** + * 修改计划 + */ + @RequiresPermissions("device:plan:edit") + @Log(title = "计划", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquPlan equPlan) { + return toAjax(equPlanService.updateEquPlan(equPlan)); + } + + /** + * 删除计划 + */ + @RequiresPermissions("device:plan:remove") + @Log(title = "计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{planIds}") + public AjaxResult remove(@PathVariable String[] planIds) { + return toAjax(equPlanService.deleteEquPlanByPlanIds(planIds)); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java index de557fa7e..67a5bbf74 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java @@ -95,6 +95,16 @@ public class EquCheckItem extends BaseEntity { // 更新日期结束 private String updateTimeEnd; + private List equCheckItemDetailList; + + public List getEquCheckItemDetailList() { + return equCheckItemDetailList; + } + + public void setEquCheckItemDetailList(List equCheckItemDetailList) { + this.equCheckItemDetailList = equCheckItemDetailList; + } + public List getUpdateTimeArray() { return updateTimeArray; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java index 09358df47..4c7a65783 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItemDetail.java @@ -85,6 +85,36 @@ public class EquCheckItemDetail extends BaseEntity { @Excel(name = "详情编码") private String detailCode; + private Boolean showFlag; + + private String standardTypeName; + + private String itemName; + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getStandardTypeName() { + return standardTypeName; + } + + public void setStandardTypeName(String standardTypeName) { + this.standardTypeName = standardTypeName; + } + + public Boolean getShowFlag() { + return showFlag; + } + + public void setShowFlag(Boolean showFlag) { + this.showFlag = showFlag; + } + public String getDetailCode() { return detailCode; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java index efa224cad..c8fa43a51 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.system.api.domain.SysUser; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -128,6 +129,26 @@ public class EquPlan extends BaseEntity { // 关联-计划->设备list private List equPlanEquList; + private List equipmentItem; + + public List getEquipmentItem() { + return equipmentItem; + } + + public void setEquipmentItem(List equipmentItem) { + this.equipmentItem = equipmentItem; + } + + private List personList; + + public List getPersonList() { + return personList; + } + + public void setPersonList(List personList) { + this.personList = personList; + } + public List getEquPlanEquList() { return equPlanEquList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java index f26dd20f9..0d61f90a9 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java @@ -57,6 +57,26 @@ public class EquPlanEqu extends BaseEntity { // 关联-设备->检查项list private List equPlanDetailList; + private List equCheckItemList; + + private String itemTempName; + + public String getItemTempName() { + return itemTempName; + } + + public void setItemTempName(String itemTempName) { + this.itemTempName = itemTempName; + } + + public List getEquCheckItemList() { + return equCheckItemList; + } + + public void setEquCheckItemList(List equCheckItemList) { + this.equCheckItemList = equCheckItemList; + } + public List getEquPlanDetailList() { return equPlanDetailList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java index 93b3d829e..6c11d033b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InspectionPlanDTO.java @@ -1,6 +1,7 @@ package com.op.device.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.system.api.domain.SysUser; import java.util.Date; import java.util.List; @@ -93,6 +94,28 @@ public class InspectionPlanDTO { // 创建日期结束 private String createTimeEnd; + // 执行时间arr + private List planTimeArray; + + // 人员list + private List personList; + + public List getPlanTimeArray() { + return planTimeArray; + } + + public void setPlanTimeArray(List planTimeArray) { + this.planTimeArray = planTimeArray; + } + + public List getPersonList() { + return personList; + } + + public void setPersonList(List personList) { + this.personList = personList; + } + public String getPlanId() { return planId; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java index 31308191c..39b52b3b9 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java @@ -84,4 +84,11 @@ public interface EquCheckItemDetailMapper { * @param itemId */ void delEquCheckItemDetailByItemId(String itemId); + + /** + * 通过检查项code查询检查项详情list + * @param itemCode + * @return + */ + List selectCheckItemDetailByItemCode(String itemCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java index 892c7133a..2baa336e0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java @@ -78,4 +78,11 @@ public interface EquCheckItemMapper { * @return */ List selectAllEquipmentList(); + + /** + * 通过设备编码查询检查项list + * @param equipmentCode + * @return + */ + List selectCheckItemByEquipmentCode(String equipmentCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java index a6e220090..2695e4b49 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java @@ -2,6 +2,8 @@ package com.op.device.mapper; import java.util.List; +import com.op.device.domain.EquCheckItem; +import com.op.device.domain.EquCheckItemDetail; import com.op.device.domain.EquPlan; import com.op.device.domain.dto.InspectionPlanDTO; import com.op.device.domain.vo.InspectionPlanVO; diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/SysUserMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SysUserMapper.java new file mode 100644 index 000000000..291db4852 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/SysUserMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import com.op.system.api.domain.SysUser; + +import java.util.List; + +/** + * 用户信息Mapper接口 + * + * @author Open Platform + * @date 2023-10-18 + */ +public interface SysUserMapper { + /** + * 查询用户信息 + * + * @param userId 用户信息主键 + * @return 用户信息 + */ + public SysUser selectSysUserByUserId(Long userId); + + /** + * 查询用户信息列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合 + */ + public List selectSysUserList(SysUser sysUser); + + /** + * 新增用户信息 + * + * @param sysUser 用户信息 + * @return 结果 + */ + public int insertSysUser(SysUser sysUser); + + /** + * 修改用户信息 + * + * @param sysUser 用户信息 + * @return 结果 + */ + public int updateSysUser(SysUser sysUser); + + /** + * 删除用户信息 + * + * @param userId 用户信息主键 + * @return 结果 + */ + public int deleteSysUserByUserId(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSysUserByUserIds(Long[] userIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java index 8f3239079..7689f1ff1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java @@ -38,7 +38,7 @@ public interface IEquPlanService { * @param equPlan 计划 * @return 结果 */ - public int insertEquPlan(EquPlan equPlan); + public AjaxResult insertEquPlan(EquPlan equPlan); /** * 修改计划 @@ -77,4 +77,10 @@ public interface IEquPlanService { * @return */ AjaxResult formatEquItem(List equPlanEquList); + + /** + * 获取人员list + * @return + */ + AjaxResult getPersonList(); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index bc276ae5e..9cccde9fc 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -6,139 +6,181 @@ 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.BaseEquipment; -import com.op.device.domain.EquPlanEqu; -import com.op.device.domain.dto.InspectionPlanDTO; -import com.op.device.domain.vo.InspectionPlanVO; -import com.op.device.mapper.BaseEquipmentMapper; +import com.op.device.domain.*; +import com.op.device.mapper.*; +import com.op.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.op.device.mapper.EquPlanMapper; -import com.op.device.domain.EquPlan; import com.op.device.service.IEquPlanService; +import static com.op.common.core.web.domain.AjaxResult.success; + /** * 计划Service业务层处理 - * + * * @author Open Platform * @date 2023-10-16 */ @Service public class EquPlanServiceImpl implements IEquPlanService { - @Autowired - private EquPlanMapper equPlanMapper; - @Autowired - private BaseEquipmentMapper baseEquipmentMapper; + @Autowired + private EquPlanMapper equPlanMapper; + @Autowired + private BaseEquipmentMapper baseEquipmentMapper; + @Autowired + private EquCheckItemMapper equCheckItemMapper; + @Autowired + private EquCheckItemDetailMapper equCheckItemDetailMapper; + @Autowired + private SysUserMapper sysUserMapper; - /** - * 查询计划 - * - * @param planId 计划主键 - * @return 计划 - */ - @Override - @DS("#header.poolName") - public EquPlan selectEquPlanByPlanId(String planId) { - return equPlanMapper.selectEquPlanByPlanId(planId); - } + /** + * 查询计划 + * + * @param planId 计划主键 + * @return 计划 + */ + @Override + @DS("#header.poolName") + public EquPlan selectEquPlanByPlanId(String planId) { + return equPlanMapper.selectEquPlanByPlanId(planId); + } - /** - * 查询计划列表 - * - * @param equPlan 计划 - * @return 计划 - */ - @Override - @DS("#header.poolName") - public List selectEquPlanList(EquPlan equPlan) { - if (equPlan.getCreateTimeArray() != null) { - // 设置创建日期开始和结束值 - if (equPlan.getCreateTimeArray().size() == 2) { - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - equPlan.setCreateTimeStart(formatter.format(equPlan.getCreateTimeArray().get(0))); - equPlan.setCreateTimeEnd(formatter.format(equPlan.getCreateTimeArray().get(1))); - } - } - if (equPlan.getUpdateTimeArray() != null) { - // 设置更新日期开始和结束 - if (equPlan.getUpdateTimeArray().size() == 2) { - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - equPlan.setUpdateTimeStart(formatter.format(equPlan.getUpdateTimeArray().get(0))); - equPlan.setUpdateTimeEnd(formatter.format(equPlan.getUpdateTimeArray().get(1))); - } - } - return equPlanMapper.selectEquPlanList(equPlan); - } + /** + * 查询计划列表 + * + * @param equPlan 计划 + * @return 计划 + */ + @Override + @DS("#header.poolName") + public List selectEquPlanList(EquPlan equPlan) { + if (equPlan.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equPlan.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equPlan.setCreateTimeStart(formatter.format(equPlan.getCreateTimeArray().get(0))); + equPlan.setCreateTimeEnd(formatter.format(equPlan.getCreateTimeArray().get(1))); + } + } + if (equPlan.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equPlan.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equPlan.setUpdateTimeStart(formatter.format(equPlan.getUpdateTimeArray().get(0))); + equPlan.setUpdateTimeEnd(formatter.format(equPlan.getUpdateTimeArray().get(1))); + } + } + return equPlanMapper.selectEquPlanList(equPlan); + } - /** - * 新增计划 - * - * @param equPlan 计划 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertEquPlan(EquPlan equPlan) { - equPlan.setCreateTime(DateUtils.getNowDate()); - return equPlanMapper.insertEquPlan(equPlan); - } + /** + * 新增计划 + * + * @param equPlan 计划 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquPlan(EquPlan equPlan) { + equPlan.setCreateTime(DateUtils.getNowDate()); + return success(); + } - /** - * 修改计划 - * - * @param equPlan 计划 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateEquPlan(EquPlan equPlan) { - equPlan.setUpdateTime(DateUtils.getNowDate()); - return equPlanMapper.updateEquPlan(equPlan); - } + /** + * 修改计划 + * + * @param equPlan 计划 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquPlan(EquPlan equPlan) { + equPlan.setUpdateTime(DateUtils.getNowDate()); + return equPlanMapper.updateEquPlan(equPlan); + } - /** - * 批量删除计划 - * - * @param planIds 需要删除的计划主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteEquPlanByPlanIds(String[] planIds) { - return equPlanMapper.deleteEquPlanByPlanIds(planIds); - } + /** + * 批量删除计划 + * + * @param planIds 需要删除的计划主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquPlanByPlanIds(String[] planIds) { + return equPlanMapper.deleteEquPlanByPlanIds(planIds); + } - /** - * 删除计划信息 - * - * @param planId 计划主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteEquPlanByPlanId(String planId) { - return equPlanMapper.deleteEquPlanByPlanId(planId); - } + /** + * 删除计划信息 + * + * @param planId 计划主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquPlanByPlanId(String planId) { + return equPlanMapper.deleteEquPlanByPlanId(planId); + } - /** - * 获取设备信息list - * @param baseEquipment - * @return - */ - @Override - @DS("#header.poolName") - public List getEquList(BaseEquipment baseEquipment) { - return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment); - } + /** + * 获取设备信息list + * + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List getEquList(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment); + } - /** - * 处理计划-设备信息 - * @param equPlanEquList - * @return - */ - @Override - public AjaxResult formatEquItem(List equPlanEquList) { + /** + * 处理计划-设备信息 + * + * @param equPlanEquList + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult formatEquItem(List equPlanEquList) { + for (EquPlanEqu data : equPlanEquList) { - return null; - } + StringBuilder itemTempName = new StringBuilder(); + + // 获取检查项list + List equCheckItemList = equCheckItemMapper.selectCheckItemByEquipmentCode(data.getEquipmentCode()); + if (equCheckItemList.size() > 0) { + for (EquCheckItem checkItem : equCheckItemList) { + if (!checkItem.getItemCode().isEmpty()) { + itemTempName.append(checkItem.getItemName()).append(","); + // 获取检查项详情list + List equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(checkItem.getItemCode()); + if (equCheckItemList.size() > 0) { + for (EquCheckItemDetail detail : equCheckItemDetailList) { + detail.setShowFlag(true); + } + checkItem.setEquCheckItemDetailList(equCheckItemDetailList); + } + } + } + data.setEquCheckItemList(equCheckItemList); + data.setItemTempName(itemTempName.toString()); + } + } + return success(equPlanEquList); + } + + /** + * 查询人员list + * @return + */ + @Override + @DS("#master") + public AjaxResult getPersonList() { + SysUser sysUser = new SysUser(); + List personList = sysUserMapper.selectSysUserList(sysUser); + return success(personList); + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml index 84360378f..7d6a56793 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml @@ -67,6 +67,11 @@ ORDER BY create_time + + insert into equ_check_item_detail diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml index a6e560136..73bb9b7e3 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml @@ -72,7 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select equipment_name AS 'equipmentName',equipment_code AS 'equipmentCode' from base_equipment where del_flag = '0' - + + + insert into equ_check_item item_id, diff --git a/op-modules/op-device/src/main/resources/mapper/device/SysUserMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SysUserMapper.xml new file mode 100644 index 000000000..a981915c4 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/SysUserMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select user_id, dept_id, user_name, nick_name, email, phonenumber, sex, avatar, password, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark from sys_user + + + + + + + + insert into sys_user + + dept_id, + user_name, + nick_name, + email, + phonenumber, + sex, + avatar, + password, + status, + del_flag, + login_ip, + login_date, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{phonenumber}, + #{sex}, + #{avatar}, + #{password}, + #{status}, + #{delFlag}, + #{loginIp}, + #{loginDate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + del_flag = #{delFlag}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where user_id = #{userId} + + + + delete from sys_user where user_id = #{userId} + + + + delete from sys_user where user_id in + + #{userId} + + + \ No newline at end of file From 38270b9b0a15e37640f97608b39a2be49170c76d Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Wed, 18 Oct 2023 16:33:24 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/controller/EquPlanController.java | 4 +--- .../op/device/service/impl/EquPlanServiceImpl.java | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java index 4177d6ee7..bb24e53eb 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -3,10 +3,8 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.op.device.domain.BaseEquipment; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquPlanEqu; -import com.op.device.domain.dto.InspectionPlanDTO; -import com.op.device.domain.vo.InspectionPlanVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 2338f6a8f..efecbfc2c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -6,15 +6,11 @@ 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.EquEquipment; -import com.op.device.domain.EquPlanEqu; -import com.op.device.domain.dto.InspectionPlanDTO; -import com.op.device.domain.vo.InspectionPlanVO; -import com.op.device.mapper.EquEquipmentMapper; +import com.op.device.domain.*; +import com.op.device.mapper.*; +import com.op.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.op.device.mapper.EquPlanMapper; -import com.op.device.domain.EquPlan; import com.op.device.service.IEquPlanService; import static com.op.common.core.web.domain.AjaxResult.success; @@ -35,8 +31,6 @@ public class EquPlanServiceImpl implements IEquPlanService { private EquCheckItemDetailMapper equCheckItemDetailMapper; @Autowired private SysUserMapper sysUserMapper; - @Autowired - private EquPlanMapper equPlanMapper; @Autowired private EquEquipmentMapper equEquipmentMapper;