diff --git a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java index 83b90f94..05b187e8 100644 --- a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java +++ b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java @@ -25,5 +25,8 @@ public interface RemoteDmsService { @PostMapping("/dmsBillsLubeInstance/autoAdd") R getDmsBillsLube(@RequestHeader(SecurityConstants.FROM_SOURCE) String source,String planInspectId); + + @PostMapping("/dmsBillsMaintInstance/autoAdd") + R getDmsBillsMaintInstance(@RequestHeader(SecurityConstants.FROM_SOURCE) String source,String dmsBillsMaintId); } diff --git a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java index e0468016..99f84dc5 100644 --- a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java +++ b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java @@ -29,6 +29,11 @@ public class RemoteDmsFallbackFactory implements FallbackFactory getDmsBillsLube(String source, String planInspectId) { return null; } + + @Override + public R getDmsBillsMaintInstance(String source, String dmsBillsMaintId) { + return null; + } }; } } diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java index 8b73db97..ece11aa0 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java @@ -59,6 +59,10 @@ public class MesBaseBarcodeInfo extends BaseEntity @Excel(name = "物料ID") private Long materialId; + /** 物料名称 */ + @Excel(name = "物料ID") + private String materialName; + /** 供应商ID */ @Excel(name = "供应商ID") private Long manufacturerId; @@ -80,18 +84,18 @@ public class MesBaseBarcodeInfo extends BaseEntity private String poNo; /** 生产日期;打印时根据领料单选择输入 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionDate; /** 接受日期;打印时的系统日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "接受日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "接受日期", width = 30, dateFormat = "yyyy-MM-dd") private Date acceptedDate; /** 最晚出库日期;可以直接输入，也可以根据日限计算 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "最晚出库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最晚出库日期", width = 30, dateFormat = "yyyy-MM-dd") private Date lastOutstockDate; /** 生产计划编号，关联mes_pd_product_plan的plan_code;适合生产出入库等 */ @@ -131,6 +135,14 @@ public class MesBaseBarcodeInfo extends BaseEntity @Excel(name = "绑定托盘时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date bindTime; + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + public String getPrintFlag() { return printFlag; } diff --git a/hw-api/hw-api-printer/pom.xml b/hw-api/hw-api-printer/pom.xml index c6d1b0cc..0c7ba419 100644 --- a/hw-api/hw-api-printer/pom.xml +++ b/hw-api/hw-api-printer/pom.xml @@ -20,7 +20,7 @@ com.hw - hw-common-core + hw-api-mes diff --git a/hw-api/hw-api-printer/src/main/java/com/hw/printer/api/RemotePrinterService.java b/hw-api/hw-api-printer/src/main/java/com/hw/printer/api/RemotePrinterService.java new file mode 100644 index 00000000..e01f6340 --- /dev/null +++ b/hw-api/hw-api-printer/src/main/java/com/hw/printer/api/RemotePrinterService.java @@ -0,0 +1,29 @@ +package com.hw.printer.api; + +import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.constant.ServiceNameConstants; +import com.hw.common.core.domain.R; +import com.hw.mes.api.domain.MesBaseBarcodeInfo; +import com.hw.printer.api.factory.RemotePrinterFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + + +@FeignClient(contextId = "remotePrinterService", value = ServiceNameConstants.PRINTER_SERVICE, fallbackFactory = RemotePrinterFallbackFactory.class) +public interface RemotePrinterService { + + /** + * 通过条码查询条码信息 + * + * @param barcodeInfo 条码信息 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/printService/printBarCode") + public MesBaseBarcodeInfo printBarCode(@RequestBody MesBaseBarcodeInfo barcodeInfo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + + + + +} diff --git a/hw-api/hw-api-printer/src/main/java/com/hw/printer/api/factory/RemotePrinterFallbackFactory.java b/hw-api/hw-api-printer/src/main/java/com/hw/printer/api/factory/RemotePrinterFallbackFactory.java new file mode 100644 index 00000000..2946547a --- /dev/null +++ b/hw-api/hw-api-printer/src/main/java/com/hw/printer/api/factory/RemotePrinterFallbackFactory.java @@ -0,0 +1,32 @@ +package com.hw.printer.api.factory; + +import com.hw.common.core.domain.R; + +import com.hw.common.core.exception.ServiceException; +import com.hw.printer.api.RemotePrinterService; +import com.hw.mes.api.domain.MesBaseBarcodeInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * 打印机服务降级处理 + * + * @author ruoyi + */ +@Component +public class RemotePrinterFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemotePrinterFallbackFactory.class); + + @Override + public RemotePrinterService create(final Throwable throwable) { + log.error("打印条码服务调用失败:{}", throwable.getMessage()); + return new RemotePrinterService() { + @Override + public MesBaseBarcodeInfo printBarCode(MesBaseBarcodeInfo barcodeInfo, String source) { + throw new ServiceException("打印条码服务调用异常:" + throwable.getMessage()); + } + }; + } +} diff --git a/hw-api/hw-api-printer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hw-api/hw-api-printer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..88431601 --- /dev/null +++ b/hw-api/hw-api-printer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.hw.mes.api.factory.RemoteMesFallbackFactory diff --git a/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java b/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java index 334666a1..40c628bd 100644 --- a/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java +++ b/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java @@ -20,4 +20,7 @@ import org.springframework.web.bind.annotation.RequestHeader; public interface RemoteSysCommonService { @GetMapping("/wfprocessactivity/list") R selectWfProcessActivity(@RequestHeader(SecurityConstants.INNER) String source, WfProcessActivity wfProcessActivity); + + @PostMapping("/wfprocessactivity/selectProcessActivityIdByWfProcessId") + Long selectProcessActivityIdByWfProcessId(@RequestHeader(SecurityConstants.FROM_SOURCE) String source, Long wfProcessId); } diff --git a/hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/WfProcessActivity.java b/hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/WfProcessActivity.java index 7bde78f4..ce37d9c8 100644 --- a/hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/WfProcessActivity.java +++ b/hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/WfProcessActivity.java @@ -18,6 +18,10 @@ public class WfProcessActivity extends BaseEntity { private static final long serialVersionUID = 1L; + public WfProcessActivity() { + + } + /** 工单流程节点ID */ private Long processActivityId; diff --git a/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java b/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java index 757150d8..0a4c9ada 100644 --- a/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java +++ b/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java @@ -1,9 +1,18 @@ package com.hw.system.api.factory; +import com.hw.common.core.domain.R; import com.hw.system.api.RemoteSysCommonService; +import com.hw.system.api.RemoteUserService; +import com.hw.system.api.domain.SysUser; +import com.hw.system.api.domain.common.WfProcessActivity; +import com.hw.system.api.model.LoginUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.rmi.Remote; + /** * 日志服务降级处理 * @@ -13,8 +22,25 @@ import org.springframework.stereotype.Component; public class RemoteSysCommonFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class); + @Override - public RemoteSysCommonService create(Throwable cause) { - return null; + public RemoteSysCommonService create(Throwable throwable) { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteSysCommonService(){ + + + @Override + public R selectWfProcessActivity(String source, WfProcessActivity wfProcessActivity) { + return null; + } + + @Override + public Long selectProcessActivityIdByWfProcessId(String source, Long wfProcessId) { + return null; + } + + + }; } } diff --git a/hw-auth/pom.xml b/hw-auth/pom.xml index 9b5bef67..21d2fd6d 100644 --- a/hw-auth/pom.xml +++ b/hw-auth/pom.xml @@ -7,53 +7,57 @@ 3.6.3 4.0.0 - + hw-auth - + hw-auth认证授权中心 - + - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-web - + org.springframework.boot spring-boot-starter-actuator - + com.hw hw-common-security - + + com.hw + hw-api-mes + + - + ${project.artifactId} @@ -70,5 +74,5 @@ - + diff --git a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java index 7e04335a..45f7d9de 100644 --- a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java +++ b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java @@ -3,6 +3,7 @@ package com.hw.auth.controller; import javax.servlet.http.HttpServletRequest; import com.hw.common.core.constant.SecurityConstants; + import com.hw.mes.api.RemoteMesService; import com.hw.mes.api.domain.MesBaseStationInfo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java index bc67fa41..ea62d1d8 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java @@ -15,10 +15,16 @@ public class MesConstants { public static final String MES_BARCODE_TYPE_PRODUCT = "3";//成品 public static final String MES_BARCODE_TYPE_BACKPLATE = "4";//背板 + /** 条码批次标识；0-否 */ + public static final String NOT_IS_BATCH = "0"; + + /** 条码批次标识；1-是 */ + public static final String IS_BATCH = "1"; + /** 工单状态；0-待发布 */ public static final String UN_PUBLISH = "0"; - /** 工单状态；0-已发布 */ + /** 工单状态；1已发布 */ public static final String PUBLISHED = "1"; /** 工单状态；2-已完成 */ diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/ServiceNameConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/ServiceNameConstants.java index 0c0b5234..60006cf9 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/ServiceNameConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/ServiceNameConstants.java @@ -47,4 +47,9 @@ public class ServiceNameConstants * System下common服务的serviceid * */ public static final String SYS_COMMON_SERVICE = "hw-system"; + + /** + * 打印机服务的serviceid + * */ + public static final String PRINTER_SERVICE = "hw-printer"; } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java index c53c3144..a948286d 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java @@ -80,6 +80,24 @@ public class Seq { // 生产计划明细标识 public static final String mesProductPlanDetailCode = "PD"; + // 生产批次代码记录标识 + public static final String mesBatchCodeSeqType = "BATCH_CODE"; + + // 生产批次代码序列数 + private static AtomicInteger mesBatchCodeSeq = new AtomicInteger(1); + + // 生产批次代码标识 + public static final String mesBatchCodeCode = "PC"; + + // 条码内容记录标识 + public static final String mesBarcodeSeqType = "BAR_CODE"; + + // 条码内容序列数 + private static AtomicInteger mesBarcodeSeq = new AtomicInteger(1); + + // 条码内容标识 + public static final String mesBarcodeCode = "TM"; + /** * 获取通用序列号 @@ -155,6 +173,10 @@ public class Seq { atomicInt = dispatchCodeSeq; }else if (planCodeSeqType.equals(type)) { atomicInt = planCodeSeq; + }else if (mesBatchCodeSeqType.equals(type)) { + atomicInt = mesBatchCodeSeq; + }else if (mesBarcodeSeqType.equals(type)) { + atomicInt = mesBarcodeSeq; } return getId(atomicInt, 3, code); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java new file mode 100644 index 00000000..10c21a64 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java @@ -0,0 +1,84 @@ +package com.hw.dms.controller; + +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.dms.domain.*; +import com.hw.dms.service.*; +import oracle.jdbc.proxy.annotation.Post; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @ClassName : DmsApiController + * @Description : zhouhy + * @Author : + * @Date: 2024-02-29 16:45 + */ +@RestController +@RequestMapping("/api") +public class DmsApiController extends BaseController { + + @Autowired + private IDmsBillsFaultInstanceService dmsBillsFaultInstanceService; + @Autowired + private IDmsRepairInstanceService dmsRepairInstanceService; + @Autowired + private IDmsBillsInspectInstanceService dmsBillsInspectInstanceService; + @Autowired + private IDmsBillsMaintInstanceService dmsBillsMaintInstanceService; + @Autowired + private IDmsBillsLubeInstanceService dmsBillsLubeInstanceService; +//APS-MyPuRz3G6HfBYcH8dw7Y2ai1D6iZRmXX apifox令牌 + /** + * PDA-报修 + * + * 需传入 + * 报修来源类型 faultSourceType + * 根据来源类型传入工单编码 faultSourceId + * 故障类别 faultType + * 故障描述 faultDescription + * 涉及操作 designOperations + * 设备id deviceId + * 维修类型 repairType + * 外协id outsrcId(可不传入) + * 图片路径 imgUrl(可不传入) + * */ + @PostMapping("/PDAFault") + @ResponseBody + public AjaxResult PDAFault(@RequestBody DmsBillsFaultInstance dmsBillsFaultInstance){ + return toAjax(dmsBillsFaultInstanceService.insertDmsBillsFaultInstance(dmsBillsFaultInstance)); + } + /** + * PDA-检修 + * */ + @PostMapping("/PDARepair") + @ResponseBody + public AjaxResult PDARepair(@RequestBody DmsRepairInstance dmsRepairInstance){ + return toAjax(dmsRepairInstanceService.insertDmsRepairInstance(dmsRepairInstance)); + } + + /** + * PDA-点巡检 + * */ + @PostMapping("/PDAInspect") + @ResponseBody + public AjaxResult PDAInspect(@RequestBody DmsBillsInspectInstance dmsBillsInspectInstance){ + return toAjax(dmsBillsInspectInstanceService.insertDmsBillsInspectInstance(dmsBillsInspectInstance)); + } + /** + * PDA-保养 + * */ + @PostMapping("/PDAMaint") + @ResponseBody + public AjaxResult PDAMaint(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance){ + return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); + } + /** + * PDA-润滑 + * */ + @PostMapping("/PDALube") + @ResponseBody + public AjaxResult PDALube(@RequestBody DmsBillsLubeInstance dmsBillsLubeInstance){ + return toAjax(dmsBillsLubeInstanceService.insertDmsBillsLubeInstance(dmsBillsLubeInstance)); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsLubeInstanceController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsLubeInstanceController.java index 8a548d38..bf173e69 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsLubeInstanceController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsLubeInstanceController.java @@ -108,6 +108,7 @@ public class DmsBillsLubeInstanceController extends BaseController dmsBillsLubeInstance.setBillsLubeCode(strDate); + return toAjax(dmsBillsLubeInstanceService.insertDmsBillsLubeInstance(dmsBillsLubeInstance)); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsMaintInstanceController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsMaintInstanceController.java new file mode 100644 index 00000000..56d1c2fa --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsMaintInstanceController.java @@ -0,0 +1,125 @@ +package com.hw.dms.controller; + +import java.text.SimpleDateFormat; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.hw.common.core.utils.DateUtils; +import com.hw.dms.domain.DmsPlanMaint; +import com.hw.dms.service.IDmsPlanMaintService; +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.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.dms.domain.DmsBillsMaintInstance; +import com.hw.dms.service.IDmsBillsMaintInstanceService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 保养工单Controller + * + * @author Open Platform + * @date 2024-02-29 + */ +@RestController +@RequestMapping("/dmsBillsMaintInstance") +public class DmsBillsMaintInstanceController extends BaseController +{ + @Autowired + private IDmsBillsMaintInstanceService dmsBillsMaintInstanceService; + @Autowired + private IDmsPlanMaintService dmsPlanMaintService; + + /** + * 查询保养工单列表 + */ + @RequiresPermissions("dms:dmsBillsMaintInstance:list") + @GetMapping("/list") + public TableDataInfo list(DmsBillsMaintInstance dmsBillsMaintInstance) + { + startPage(); + List list = dmsBillsMaintInstanceService.selectDmsBillsMaintInstanceList(dmsBillsMaintInstance); + return getDataTable(list); + } + + /** + * 导出保养工单列表 + */ + @RequiresPermissions("dms:dmsBillsMaintInstance:export") + @Log(title = "保养工单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsBillsMaintInstance dmsBillsMaintInstance) + { + List list = dmsBillsMaintInstanceService.selectDmsBillsMaintInstanceList(dmsBillsMaintInstance); + ExcelUtil util = new ExcelUtil(DmsBillsMaintInstance.class); + util.exportExcel(response, list, "保养工单数据"); + } + + /** + * 获取保养工单详细信息 + */ + @RequiresPermissions("dms:dmsBillsMaintInstance:query") + @GetMapping(value = "/{maintInstanceId}") + public AjaxResult getInfo(@PathVariable("maintInstanceId") Long maintInstanceId) + { + return success(dmsBillsMaintInstanceService.selectDmsBillsMaintInstanceByMaintInstanceId(maintInstanceId)); + } + + /** + * 新增保养工单 + */ + @RequiresPermissions("dms:dmsBillsMaintInstance:add") + @Log(title = "保养工单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance) + { + return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); + } + @PostMapping("/autoAdd") + public AjaxResult autoAdd(@RequestBody String dmsBillsMaintId) + { + String s = dmsBillsMaintId.replaceAll("\"", ""); + DmsPlanMaint dmsPlanMaint = dmsPlanMaintService.selectDmsPlanMaintByPlanMaintId(Long.valueOf(s)); + DmsBillsMaintInstance dmsBillsMaintInstance = new DmsBillsMaintInstance(); + dmsBillsMaintInstance.setPlanMaintId(dmsPlanMaint.getPlanMaintId()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhh"); + + dmsBillsMaintInstance.setBillsMaintCode(sdf.format(DateUtils.getNowDate())); + return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); + + } + + /** + * 修改保养工单 + */ + @RequiresPermissions("dms:dmsBillsMaintInstance:edit") + @Log(title = "保养工单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance) + { + return toAjax(dmsBillsMaintInstanceService.updateDmsBillsMaintInstance(dmsBillsMaintInstance)); + } + + /** + * 删除保养工单 + */ + @RequiresPermissions("dms:dmsBillsMaintInstance:remove") + @Log(title = "保养工单", businessType = BusinessType.DELETE) + @DeleteMapping("/{maintInstanceIds}") + public AjaxResult remove(@PathVariable Long[] maintInstanceIds) + { + return toAjax(dmsBillsMaintInstanceService.deleteDmsBillsMaintInstanceByMaintInstanceIds(maintInstanceIds)); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsFaultInstanceFileController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsFaultInstanceFileController.java new file mode 100644 index 00000000..7291cdd0 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsFaultInstanceFileController.java @@ -0,0 +1,105 @@ +package com.hw.dms.controller; + +import java.util.List; +import java.io.IOException; +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.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.dms.domain.DmsFaultInstanceFile; +import com.hw.dms.service.IDmsFaultInstanceFileService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 故障文件;手工创建，从故障报修开始Controller + * + * @author Open Platform + * @date 2024-02-29 + */ +@RestController +@RequestMapping("/dmsFaultInstanceFile") +public class DmsFaultInstanceFileController extends BaseController +{ + @Autowired + private IDmsFaultInstanceFileService dmsFaultInstanceFileService; + + /** + * 查询故障文件;手工创建，从故障报修开始列表 + */ + @RequiresPermissions("dms:dmsFaultInstanceFile:list") + @GetMapping("/list") + public TableDataInfo list(DmsFaultInstanceFile dmsFaultInstanceFile) + { + startPage(); + List list = dmsFaultInstanceFileService.selectDmsFaultInstanceFileList(dmsFaultInstanceFile); + return getDataTable(list); + } + + /** + * 导出故障文件;手工创建，从故障报修开始列表 + */ + @RequiresPermissions("dms:dmsFaultInstanceFile:export") + @Log(title = "故障文件;手工创建，从故障报修开始", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsFaultInstanceFile dmsFaultInstanceFile) + { + List list = dmsFaultInstanceFileService.selectDmsFaultInstanceFileList(dmsFaultInstanceFile); + ExcelUtil util = new ExcelUtil(DmsFaultInstanceFile.class); + util.exportExcel(response, list, "故障文件;手工创建，从故障报修开始数据"); + } + + /** + * 获取故障文件;手工创建，从故障报修开始详细信息 + */ + @RequiresPermissions("dms:dmsFaultInstanceFile:query") + @GetMapping(value = "/{repairInstanceFileId}") + public AjaxResult getInfo(@PathVariable("repairInstanceFileId") Long repairInstanceFileId) + { + return success(dmsFaultInstanceFileService.selectDmsFaultInstanceFileByRepairInstanceFileId(repairInstanceFileId)); + } + + /** + * 新增故障文件;手工创建，从故障报修开始 + */ + @RequiresPermissions("dms:dmsFaultInstanceFile:add") + @Log(title = "故障文件;手工创建，从故障报修开始", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsFaultInstanceFile dmsFaultInstanceFile) + { + return toAjax(dmsFaultInstanceFileService.insertDmsFaultInstanceFile(dmsFaultInstanceFile)); + } + + /** + * 修改故障文件;手工创建，从故障报修开始 + */ + @RequiresPermissions("dms:dmsFaultInstanceFile:edit") + @Log(title = "故障文件;手工创建，从故障报修开始", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsFaultInstanceFile dmsFaultInstanceFile) + { + return toAjax(dmsFaultInstanceFileService.updateDmsFaultInstanceFile(dmsFaultInstanceFile)); + } + + /** + * 删除故障文件;手工创建，从故障报修开始 + */ + @RequiresPermissions("dms:dmsFaultInstanceFile:remove") + @Log(title = "故障文件;手工创建，从故障报修开始", businessType = BusinessType.DELETE) + @DeleteMapping("/{repairInstanceFileIds}") + public AjaxResult remove(@PathVariable Long[] repairInstanceFileIds) + { + return toAjax(dmsFaultInstanceFileService.deleteDmsFaultInstanceFileByRepairInstanceFileIds(repairInstanceFileIds)); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMaintInstanceActivityController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMaintInstanceActivityController.java new file mode 100644 index 00000000..214152ae --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMaintInstanceActivityController.java @@ -0,0 +1,110 @@ +package com.hw.dms.controller; + +import java.util.List; +import java.io.IOException; +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.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.dms.domain.DmsMaintInstanceActivity; +import com.hw.dms.service.IDmsMaintInstanceActivityService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 保养工单实例节点Controller + * + * @author Open Platform + * @date 2024-02-29 + */ +@RestController +@RequestMapping("/dmsMaintInstanceActivity") +public class DmsMaintInstanceActivityController extends BaseController +{ + @Autowired + private IDmsMaintInstanceActivityService dmsMaintInstanceActivityService; + + /** + * 查询保养工单实例节点列表 + */ + @RequiresPermissions("dms:dmsMaintInstanceActivity:list") + @GetMapping("/list") + public TableDataInfo list(DmsMaintInstanceActivity dmsMaintInstanceActivity) + { + startPage(); + List list = dmsMaintInstanceActivityService.selectDmsMaintInstanceActivityList(dmsMaintInstanceActivity); + return getDataTable(list); + } + + /** + * 导出保养工单实例节点列表 + */ + @RequiresPermissions("dms:dmsMaintInstanceActivity:export") + @Log(title = "保养工单实例节点", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsMaintInstanceActivity dmsMaintInstanceActivity) + { + List list = dmsMaintInstanceActivityService.selectDmsMaintInstanceActivityList(dmsMaintInstanceActivity); + ExcelUtil util = new ExcelUtil(DmsMaintInstanceActivity.class); + util.exportExcel(response, list, "保养工单实例节点数据"); + } + + /** + * 获取保养工单实例节点详细信息 + */ + @RequiresPermissions("dms:dmsMaintInstanceActivity:query") + @GetMapping(value = "/{instanceActivityId}") + public AjaxResult getInfo(@PathVariable("instanceActivityId") Long instanceActivityId) + { + return success(dmsMaintInstanceActivityService.selectDmsMaintInstanceActivityByInstanceActivityId(instanceActivityId)); + } + + /** + * 新增保养工单实例节点 + */ + @RequiresPermissions("dms:dmsMaintInstanceActivity:add") + @Log(title = "保养工单实例节点", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsMaintInstanceActivity dmsMaintInstanceActivity) + { + return toAjax(dmsMaintInstanceActivityService.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity)); + } + + /** + * 修改保养工单实例节点 + */ + @RequiresPermissions("dms:dmsMaintInstanceActivity:edit") + @Log(title = "保养工单实例节点", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsMaintInstanceActivity dmsMaintInstanceActivity) + { + return toAjax(dmsMaintInstanceActivityService.updateDmsMaintInstanceActivity(dmsMaintInstanceActivity)); + } + + /** + * 删除保养工单实例节点 + */ + @RequiresPermissions("dms:dmsMaintInstanceActivity:remove") + @Log(title = "保养工单实例节点", businessType = BusinessType.DELETE) + @DeleteMapping("/{instanceActivityIds}") + public AjaxResult remove(@PathVariable Long[] instanceActivityIds) + { + return toAjax(dmsMaintInstanceActivityService.deleteDmsMaintInstanceActivityByInstanceActivityIds(instanceActivityIds)); + } + + @GetMapping("/selectUserIdByDmsMaintInstanceActivityId/{maintInstanceId}/userId/{userId}") + public boolean selectUserIdByDmsMaintInstanceActivityId(@PathVariable("maintInstanceId") Long maintInstanceId,@PathVariable("userId") Long userId){ + return dmsMaintInstanceActivityService.selectUserIdByDmsMaintInstanceActivityId(maintInstanceId,userId); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java index 1c59096c..5a0d505f 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java @@ -93,21 +93,20 @@ public class DmsPlanLubeController extends BaseController Date nextExecution = CronUtils.getNextExecution(time); dmsPlanLube.setLubeTime(nextExecution); int i = dmsPlanLubeService.insertDmsPlanLube(dmsPlanLube); - List dmsPlanLubes = dmsPlanLubeService.selectDmsPlanLubeList(dmsPlanLube); - DmsPlanLube dmsPlanLube1 = dmsPlanLubes.get(0); + SysJob job = new SysJob(); - job.setJobName("创建计划编号为"+dmsPlanLube1.getPlanLubeCode()+"工单"); + job.setJobName("创建计划编号为"+dmsPlanLube.getPlanLubeCode()+"工单"); job.setJobGroup("DEFAULT"); - job.setInvokeTarget("ryTask.getDmsBillsLube(\""+dmsPlanLube1.getPlanLubeId()+"\")"); + job.setInvokeTarget("ryTask.getDmsBillsLube(\""+dmsPlanLube.getPlanLubeId()+"\")"); job.setCronExpression(dmsPlanLube.getCronExpression()); job.setMisfirePolicy("1"); job.setConcurrent("1"); job.setStatus("1"); remoteJobService.add(SecurityConstants.INNER,job); - SysJob job1 = remoteJobService.selectJobList(dmsPlanLubes.get(0).getPlanLubeId()); - dmsPlanLubes.get(0).setJobId(job1.getJobId()); - dmsPlanLubeService.updateDmsPlanLube(dmsPlanLubes.get(0)); + SysJob job1 = remoteJobService.selectJobList(dmsPlanLube.getPlanLubeId()); + dmsPlanLube.setJobId(job1.getJobId()); + dmsPlanLubeService.updateDmsPlanLube(dmsPlanLube); return toAjax(i); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java index df618de0..950e0fca 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java @@ -1,8 +1,14 @@ package com.hw.dms.controller; +import java.util.Date; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import com.hw.common.core.constant.SecurityConstants; +import com.hw.job.api.RemoteJobService; +import com.hw.job.api.domain.SysJob; +import com.hw.job.api.util.CronUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -24,7 +30,7 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 保养计划信息Controller - * + * * @author xins * @date 2024-01-08 */ @@ -34,6 +40,8 @@ public class DmsPlanMaintController extends BaseController { @Autowired private IDmsPlanMaintService dmsPlanMaintService; + @Autowired + private RemoteJobService remoteJobService; /** * 查询保养计划信息列表 @@ -78,7 +86,25 @@ public class DmsPlanMaintController extends BaseController @PostMapping public AjaxResult add(@RequestBody DmsPlanMaint dmsPlanMaint) { - return toAjax(dmsPlanMaintService.insertDmsPlanMaint(dmsPlanMaint)); + String time = dmsPlanMaint.getCronExpression(); + //通过cron表达式获取下一次执行时间 + Date nextExecution = CronUtils.getNextExecution(time); + dmsPlanMaint.setMaintTime(nextExecution); + int i = dmsPlanMaintService.insertDmsPlanMaint(dmsPlanMaint); + + SysJob job = new SysJob(); + job.setJobName("创建计划编号为"+dmsPlanMaint.getPlanMaintCode()+"工单"); + job.setJobGroup("DEFAULT"); + job.setInvokeTarget("ryTask.getDmsBillsLube(\""+dmsPlanMaint.getPlanMaintId()+"\")"); + job.setCronExpression(dmsPlanMaint.getCronExpression()); + job.setMisfirePolicy("1"); + job.setConcurrent("1"); + job.setStatus("1"); + remoteJobService.add(SecurityConstants.INNER,job); + SysJob job1 = remoteJobService.selectJobList(dmsPlanMaint.getPlanMaintId()); + dmsPlanMaint.setJobId(job1.getJobId()); + dmsPlanMaintService.updateDmsPlanMaint(dmsPlanMaint); + return toAjax(i); } /** diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairController.java index f5b2b3d6..64bc0f0a 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairController.java @@ -95,20 +95,19 @@ public class DmsPlanRepairController extends BaseController dmsPlanRepair.setRepairTime(nextExecution); AjaxResult ajaxResult = toAjax(dmsPlanRepairService.insertDmsPlanRepair(dmsPlanRepair)); - List dmsPlanRepairs = dmsPlanRepairService.selectDmsPlanRepairList(dmsPlanRepair); - DmsPlanRepair dmsPlanRepair1 = dmsPlanRepairs.get(0); + SysJob job = new SysJob(); job.setJobName("创建计划编号为"+dmsPlanRepair.getPlanRepairCode()+"工单"); job.setJobGroup("DEFAULT"); - job.setInvokeTarget("ryTask.getDmsRepairInstance(\""+dmsPlanRepair1.getPlanRepairId()+"\")"); + job.setInvokeTarget("ryTask.getDmsRepairInstance(\""+dmsPlanRepair.getPlanRepairId()+"\")"); job.setCronExpression(dmsPlanRepair.getCronExpression()); job.setMisfirePolicy("1"); job.setConcurrent("1"); job.setStatus("1"); remoteJobService.add(SecurityConstants.INNER,job); - SysJob job1 = remoteJobService.selectJobList(dmsPlanRepairs.get(0).getPlanRepairId()); - dmsPlanRepairs.get(0).setJobId(job1.getJobId()); - dmsPlanRepairService.updateDmsPlanRepair(dmsPlanRepairs.get(0)); + SysJob job1 = remoteJobService.selectJobList(dmsPlanRepair.getPlanRepairId()); + dmsPlanRepair.setJobId(job1.getJobId()); + dmsPlanRepairService.updateDmsPlanRepair(dmsPlanRepair); return ajaxResult; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java index 1a30334c..9ec0025e 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java @@ -1,7 +1,10 @@ package com.hw.dms.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; +import com.hw.system.api.domain.SysFile; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.hw.common.core.annotation.Excel; @@ -70,6 +73,15 @@ public class DmsBillsFaultInstance extends BaseEntity /** 是否标识：1-是；0-否 */ @Excel(name = "是否标识：1-是；0-否") + + private List dmsFaultInstanceFiles; + + private List sysFiles; + + + + private String imgUrl; + private String isFlag; private String faultType; @@ -84,6 +96,29 @@ public class DmsBillsFaultInstance extends BaseEntity private Long outsrcId; + public List getSysFiles() { + return sysFiles; + } + + public void setSysFiles(List sysFiles) { + this.sysFiles = sysFiles; + } + + public List getDmsFaultInstanceFiles() { + return dmsFaultInstanceFiles; + } + + public void setDmsFaultInstanceFiles(List dmsFaultInstanceFiles) { + this.dmsFaultInstanceFiles = dmsFaultInstanceFiles; + } + public String getImgUrl() { + return imgUrl; + } + + public void setImgUrl(String imgUrl) { + this.imgUrl = imgUrl; + } + public String getFaultType() { return faultType; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeInstance.java index b5358b11..e8fa1f62 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeInstance.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeInstance.java @@ -9,7 +9,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 润滑工单对象 dms_bills_lube_instance - * + * * @author Open Platform * @date 2024-02-26 */ @@ -56,84 +56,114 @@ public class DmsBillsLubeInstance extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; - public void setLubeInstanceId(Long lubeInstanceId) + private String lubeGroup; + + private String lubeSupervisor; + + private String lubeLevel; + + public String getLubeGroup() { + return lubeGroup; + } + + public void setLubeGroup(String lubeGroup) { + this.lubeGroup = lubeGroup; + } + + public String getLubeSupervisor() { + return lubeSupervisor; + } + + public void setLubeSupervisor(String lubeSupervisor) { + this.lubeSupervisor = lubeSupervisor; + } + + public String getLubeLevel() { + return lubeLevel; + } + + public void setLubeLevel(String lubeLevel) { + this.lubeLevel = lubeLevel; + } + + public void setLubeInstanceId(Long lubeInstanceId) { this.lubeInstanceId = lubeInstanceId; } - public Long getLubeInstanceId() + public Long getLubeInstanceId() { return lubeInstanceId; } - public void setPlanLubeId(Long planLubeId) + public void setPlanLubeId(Long planLubeId) { this.planLubeId = planLubeId; } - public Long getPlanLubeId() + public Long getPlanLubeId() { return planLubeId; } - public void setBillsLubeCode(String billsLubeCode) + public void setBillsLubeCode(String billsLubeCode) { this.billsLubeCode = billsLubeCode; } - public String getBillsLubeCode() + public String getBillsLubeCode() { return billsLubeCode; } - public void setPlanBeginTime(Date planBeginTime) + public void setPlanBeginTime(Date planBeginTime) { this.planBeginTime = planBeginTime; } - public Date getPlanBeginTime() + public Date getPlanBeginTime() { return planBeginTime; } - public void setRealBeginTime(Date realBeginTime) + public void setRealBeginTime(Date realBeginTime) { this.realBeginTime = realBeginTime; } - public Date getRealBeginTime() + public Date getRealBeginTime() { return realBeginTime; } - public void setPlanEndTime(Date planEndTime) + public void setPlanEndTime(Date planEndTime) { this.planEndTime = planEndTime; } - public Date getPlanEndTime() + public Date getPlanEndTime() { return planEndTime; } - public void setRealEndTime(Date realEndTime) + public void setRealEndTime(Date realEndTime) { this.realEndTime = realEndTime; } - public Date getRealEndTime() + public Date getRealEndTime() { return realEndTime; } - public void setLubeStatus(String lubeStatus) + public void setLubeStatus(String lubeStatus) { this.lubeStatus = lubeStatus; } - public String getLubeStatus() + public String getLubeStatus() { return lubeStatus; } - public void setIsFlag(String isFlag) + public void setIsFlag(String isFlag) { this.isFlag = isFlag; } - public String getIsFlag() + public String getIsFlag() { return isFlag; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintInstance.java new file mode 100644 index 00000000..92347d89 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintInstance.java @@ -0,0 +1,216 @@ +package com.hw.dms.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.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 保养工单对象 dms_bills_maint_instance + * + * @author Open Platform + * @date 2024-02-29 + */ +public class DmsBillsMaintInstance extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long maintInstanceId; + + /** 保养计划ID,关联dms_plan_maint的plan_maint_id */ + @Excel(name = "保养计划ID,关联dms_plan_maint的plan_maint_id") + private Long planMaintId; + + /** 工单流程ID，关联wf_process的wf_process_id */ + @Excel(name = "工单流程ID，关联wf_process的wf_process_id") + private Long wfProcessId; + + /** 保养单号 */ + @Excel(name = "保养单号") + private String billsMaintCode; + + /** 计划保养时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划保养时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date planBeginTime; + + /** 实际开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date realBeginTime; + + /** 计划完成时间;根据计划的时限计算 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划完成时间;根据计划的时限计算", width = 30, dateFormat = "yyyy-MM-dd") + private Date planEndTime; + + /** 实际完成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date realEndTime; + + /** 保养状态：1-待保养；2-保养中；3-已完成 */ + @Excel(name = "保养状态：1-待保养；2-保养中；3-已完成") + private Long maintStatus; + + /** 保养完成率 */ + @Excel(name = "保养完成率") + private BigDecimal maintCompRate; + + /** 是否标识：1-是；2-否 */ + @Excel(name = "是否标识：1-是；2-否") + private Long isFlag; + private Long maintLevel; + private String maintGroup; + private String maintSupervisor; + + public Long getMaintLevel() { + return maintLevel; + } + + public void setMaintLevel(Long maintLevel) { + this.maintLevel = maintLevel; + } + + public String getMaintGroup() { + return maintGroup; + } + + public void setMaintGroup(String maintGroup) { + this.maintGroup = maintGroup; + } + + public String getMaintSupervisor() { + return maintSupervisor; + } + + public void setMaintSupervisor(String maintSupervisor) { + this.maintSupervisor = maintSupervisor; + } + + public void setMaintInstanceId(Long maintInstanceId) + { + this.maintInstanceId = maintInstanceId; + } + + public Long getMaintInstanceId() + { + return maintInstanceId; + } + public void setPlanMaintId(Long planMaintId) + { + this.planMaintId = planMaintId; + } + + public Long getPlanMaintId() + { + return planMaintId; + } + public void setWfProcessId(Long wfProcessId) + { + this.wfProcessId = wfProcessId; + } + + public Long getWfProcessId() + { + return wfProcessId; + } + public void setBillsMaintCode(String billsMaintCode) + { + this.billsMaintCode = billsMaintCode; + } + + public String getBillsMaintCode() + { + return billsMaintCode; + } + public void setPlanBeginTime(Date planBeginTime) + { + this.planBeginTime = planBeginTime; + } + + public Date getPlanBeginTime() + { + return planBeginTime; + } + public void setRealBeginTime(Date realBeginTime) + { + this.realBeginTime = realBeginTime; + } + + public Date getRealBeginTime() + { + return realBeginTime; + } + public void setPlanEndTime(Date planEndTime) + { + this.planEndTime = planEndTime; + } + + public Date getPlanEndTime() + { + return planEndTime; + } + public void setRealEndTime(Date realEndTime) + { + this.realEndTime = realEndTime; + } + + public Date getRealEndTime() + { + return realEndTime; + } + public void setMaintStatus(Long maintStatus) + { + this.maintStatus = maintStatus; + } + + public Long getMaintStatus() + { + return maintStatus; + } + public void setMaintCompRate(BigDecimal maintCompRate) + { + this.maintCompRate = maintCompRate; + } + + public BigDecimal getMaintCompRate() + { + return maintCompRate; + } + public void setIsFlag(Long isFlag) + { + this.isFlag = isFlag; + } + + public Long getIsFlag() + { + return isFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("maintInstanceId", getMaintInstanceId()) + .append("planMaintId", getPlanMaintId()) + .append("wfProcessId", getWfProcessId()) + .append("billsMaintCode", getBillsMaintCode()) + .append("planBeginTime", getPlanBeginTime()) + .append("realBeginTime", getRealBeginTime()) + .append("planEndTime", getPlanEndTime()) + .append("realEndTime", getRealEndTime()) + .append("maintStatus", getMaintStatus()) + .append("maintCompRate", getMaintCompRate()) + .append("isFlag", getIsFlag()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceFile.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceFile.java new file mode 100644 index 00000000..1a47c4b4 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceFile.java @@ -0,0 +1,79 @@ +package com.hw.dms.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 故障文件;手工创建，从故障报修开始对象 dms_fault_instance_file + * + * @author Open Platform + * @date 2024-02-29 + */ +public class DmsFaultInstanceFile extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long repairInstanceFileId; + + /** 关联类型(1故障报修工单实例节点，2故障记录) */ + @Excel(name = "关联类型(1故障报修工单实例节点，2故障记录)") + private String targetType; + + /** 关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID */ + @Excel(name = "关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID") + private Long targetId; + + /** 故障文件地址，一般是图片 */ + @Excel(name = "故障文件地址，一般是图片") + private String faultFile; + + public void setRepairInstanceFileId(Long repairInstanceFileId) + { + this.repairInstanceFileId = repairInstanceFileId; + } + + public Long getRepairInstanceFileId() + { + return repairInstanceFileId; + } + public void setTargetType(String targetType) + { + this.targetType = targetType; + } + + public String getTargetType() + { + return targetType; + } + public void setTargetId(Long targetId) + { + this.targetId = targetId; + } + + public Long getTargetId() + { + return targetId; + } + public void setFaultFile(String faultFile) + { + this.faultFile = faultFile; + } + + public String getFaultFile() + { + return faultFile; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("repairInstanceFileId", getRepairInstanceFileId()) + .append("targetType", getTargetType()) + .append("targetId", getTargetId()) + .append("faultFile", getFaultFile()) + .toString(); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsMaintInstanceActivity.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsMaintInstanceActivity.java new file mode 100644 index 00000000..85298041 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsMaintInstanceActivity.java @@ -0,0 +1,264 @@ +package com.hw.dms.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.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 保养工单实例节点对象 dms_maint_instance_activity + * + * @author Open Platform + * @date 2024-02-29 + */ +public class DmsMaintInstanceActivity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 保养工单实例节点ID */ + private Long instanceActivityId; + + /** 保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id */ + @Excel(name = "保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id") + private Long maintInstanceId; + + /** 工单流程节点ID（关联wf_process_activity的process_activity_id） */ + @Excel(name = "工单流程节点ID", readConverterExp = "关=联wf_process_activity的process_activity_id") + private Long processActivityId; + + /** 保养级别：1-日常保养；2-月度保养；3-年度保养;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 */ + @Excel(name = "保养级别：1-日常保养；2-月度保养；3-年度保养;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private Long maintLevel; + + /** 保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 */ + @Excel(name = "保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private String maintGroup; + + /** 保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 */ + @Excel(name = "保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") + private String maintSupervisor; + + /** 处理意见;第一步不显示，从第二步开始只显示此字段 */ + @Excel(name = "处理意见;第一步不显示，从第二步开始只显示此字段") + private String processHandleResolution; + + /** 状态(0已结束，1执行中，2、待接取，3、已转发） */ + @Excel(name = "状态(0已结束，1执行中，2、待接取，3、已转发）") + private String processHandleStatus; + + /** 工单流程步骤顺序 */ + @Excel(name = "工单流程步骤顺序") + private Long processStepOrder; + + /** 执行开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "执行开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 执行结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "执行结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** 处理人ID（关联sys_user的user_id) */ + @Excel(name = "处理人ID", readConverterExp = "处理人ID（关联sys_user的user_id)") + private Long handleUserId; + + /** 处理人 */ + @Excel(name = "处理人") + private String handleBy; + + /** 处理时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date handleTime; + + /** 转单人用户id或转发协助用户id;1、在转发时，生成新的工单节点实例，执行人id为转发的用户，而转单人是刚才转发给此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束2、在添加协助时，生成新的工单节点实例，执行人id为添加协助的用户，而转单人是刚才添加协助此用户的用户id，是否协助工单为1，并且转发后当前工单的状态仍为执行中 */ + @Excel(name = "转单人用户id或转发协助用户id;1、在转发时，生成新的工单节点实例，执行人id为转发的用户，而转单人是刚才转发给此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束此用户的用户id，是否协助工单为0，并且转发后当前工单的状态为已结束2、在添加协助时，生成新的工单节点实例，执行人id为添加协助的用户，而转单人是刚才添加协助此用户的用户id，是否协助工单为1，并且转发后当前工单的状态仍为执行中") + private Long transferUserId; + + /** 用户预留1 */ + @Excel(name = "用户预留1") + private String attr1; + private Long wfLength; + + public Long getWfLength() { + return wfLength; + } + + public void setWfLength(Long wfLength) { + this.wfLength = wfLength; + } + + public void setInstanceActivityId(Long instanceActivityId) + { + this.instanceActivityId = instanceActivityId; + } + + public Long getInstanceActivityId() + { + return instanceActivityId; + } + public void setMaintInstanceId(Long maintInstanceId) + { + this.maintInstanceId = maintInstanceId; + } + + public Long getMaintInstanceId() + { + return maintInstanceId; + } + public void setProcessActivityId(Long processActivityId) + { + this.processActivityId = processActivityId; + } + + public Long getProcessActivityId() + { + return processActivityId; + } + public void setMaintLevel(Long maintLevel) + { + this.maintLevel = maintLevel; + } + + public Long getMaintLevel() + { + return maintLevel; + } + public void setMaintGroup(String maintGroup) + { + this.maintGroup = maintGroup; + } + + public String getMaintGroup() + { + return maintGroup; + } + public void setMaintSupervisor(String maintSupervisor) + { + this.maintSupervisor = maintSupervisor; + } + + public String getMaintSupervisor() + { + return maintSupervisor; + } + public void setProcessHandleResolution(String processHandleResolution) + { + this.processHandleResolution = processHandleResolution; + } + + public String getProcessHandleResolution() + { + return processHandleResolution; + } + public void setProcessHandleStatus(String processHandleStatus) + { + this.processHandleStatus = processHandleStatus; + } + + public String getProcessHandleStatus() + { + return processHandleStatus; + } + public void setProcessStepOrder(Long processStepOrder) + { + this.processStepOrder = processStepOrder; + } + + public Long getProcessStepOrder() + { + return processStepOrder; + } + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStartTime() + { + return startTime; + } + public void setEndTime(Date endTime) + { + this.endTime = endTime; + } + + public Date getEndTime() + { + return endTime; + } + public void setHandleUserId(Long handleUserId) + { + this.handleUserId = handleUserId; + } + + public Long getHandleUserId() + { + return handleUserId; + } + public void setHandleBy(String handleBy) + { + this.handleBy = handleBy; + } + + public String getHandleBy() + { + return handleBy; + } + public void setHandleTime(Date handleTime) + { + this.handleTime = handleTime; + } + + public Date getHandleTime() + { + return handleTime; + } + public void setTransferUserId(Long transferUserId) + { + this.transferUserId = transferUserId; + } + + public Long getTransferUserId() + { + return transferUserId; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("instanceActivityId", getInstanceActivityId()) + .append("maintInstanceId", getMaintInstanceId()) + .append("processActivityId", getProcessActivityId()) + .append("maintLevel", getMaintLevel()) + .append("maintGroup", getMaintGroup()) + .append("maintSupervisor", getMaintSupervisor()) + .append("processHandleResolution", getProcessHandleResolution()) + .append("remark", getRemark()) + .append("processHandleStatus", getProcessHandleStatus()) + .append("processStepOrder", getProcessStepOrder()) + .append("startTime", getStartTime()) + .append("endTime", getEndTime()) + .append("handleUserId", getHandleUserId()) + .append("handleBy", getHandleBy()) + .append("handleTime", getHandleTime()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("transferUserId", getTransferUserId()) + .append("attr1", getAttr1()) + .toString(); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java index 3e9d1cab..dff70e87 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java @@ -10,7 +10,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 保养计划信息对象 dms_plan_maint - * + * * @author xins * @date 2024-01-08 */ @@ -41,6 +41,13 @@ public class DmsPlanMaint extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "本次保养时间", width = 30, dateFormat = "yyyy-MM-dd") private Date maintTime; + @Excel(name = "关联sys_job主键") + private Long jobId; + + @Excel(name = "时限") + private Long timeLimit; + + /** 循环周期 */ @Excel(name = "循环周期") @@ -58,96 +65,140 @@ public class DmsPlanMaint extends BaseEntity @Excel(name = "是否标识：1-是；2-否") private Long isFlag; + private String cronExpression; + private Long timeLimitDays; + private Long timeLimitHours; + + public Long getTimeLimitDays() { + return timeLimitDays; + } + + public void setTimeLimitDays(Long timeLimitDays) { + this.timeLimitDays = timeLimitDays; + } + + public Long getTimeLimitHours() { + return timeLimitHours; + } + + public void setTimeLimitHours(Long timeLimitHours) { + this.timeLimitHours = timeLimitHours; + } + + public String getCronExpression() { + return cronExpression; + } + + public void setCronExpression(String cronExpression) { + this.cronExpression = cronExpression; + } + + public Long getJobId() { + return jobId; + } + + public void setJobId(Long jobId) { + this.jobId = jobId; + } + + public Long getTimeLimit() { + return timeLimit; + } + + public void setTimeLimit(Long timeLimit) { + this.timeLimit = timeLimit; + } + /** 保养计划明细信息 */ private List dmsPlanMaintDetailList; - public void setPlanMaintId(Long planMaintId) + public void setPlanMaintId(Long planMaintId) { this.planMaintId = planMaintId; } - public Long getPlanMaintId() + public Long getPlanMaintId() { return planMaintId; } - public void setPlanMaintCode(String planMaintCode) + public void setPlanMaintCode(String planMaintCode) { this.planMaintCode = planMaintCode; } - public String getPlanMaintCode() + public String getPlanMaintCode() { return planMaintCode; } - public void setMaintLevel(Long maintLevel) + public void setMaintLevel(Long maintLevel) { this.maintLevel = maintLevel; } - public Long getMaintLevel() + public Long getMaintLevel() { return maintLevel; } - public void setMaintGroup(String maintGroup) + public void setMaintGroup(String maintGroup) { this.maintGroup = maintGroup; } - public String getMaintGroup() + public String getMaintGroup() { return maintGroup; } - public void setMaintSupervisor(String maintSupervisor) + public void setMaintSupervisor(String maintSupervisor) { this.maintSupervisor = maintSupervisor; } - public String getMaintSupervisor() + public String getMaintSupervisor() { return maintSupervisor; } - public void setMaintTime(Date maintTime) + public void setMaintTime(Date maintTime) { this.maintTime = maintTime; } - public Date getMaintTime() + public Date getMaintTime() { return maintTime; } - public void setCyclePeriod(Long cyclePeriod) + public void setCyclePeriod(Long cyclePeriod) { this.cyclePeriod = cyclePeriod; } - public Long getCyclePeriod() + public Long getCyclePeriod() { return cyclePeriod; } - public void setMaintStatus(Long maintStatus) + public void setMaintStatus(Long maintStatus) { this.maintStatus = maintStatus; } - public Long getMaintStatus() + public Long getMaintStatus() { return maintStatus; } - public void setCreateMethod(Long createMethod) + public void setCreateMethod(Long createMethod) { this.createMethod = createMethod; } - public Long getCreateMethod() + public Long getCreateMethod() { return createMethod; } - public void setIsFlag(Long isFlag) + public void setIsFlag(Long isFlag) { this.isFlag = isFlag; } - public Long getIsFlag() + public Long getIsFlag() { return isFlag; } @@ -164,23 +215,21 @@ public class DmsPlanMaint extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("planMaintId", getPlanMaintId()) - .append("planMaintCode", getPlanMaintCode()) - .append("maintLevel", getMaintLevel()) - .append("maintGroup", getMaintGroup()) - .append("maintSupervisor", getMaintSupervisor()) - .append("maintTime", getMaintTime()) - .append("cyclePeriod", getCyclePeriod()) - .append("maintStatus", getMaintStatus()) - .append("createMethod", getCreateMethod()) - .append("isFlag", getIsFlag()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("dmsPlanMaintDetailList", getDmsPlanMaintDetailList()) - .toString(); + return "DmsPlanMaint{" + + "planMaintId=" + planMaintId + + ", planMaintCode='" + planMaintCode + '\'' + + ", maintLevel=" + maintLevel + + ", maintGroup='" + maintGroup + '\'' + + ", maintSupervisor='" + maintSupervisor + '\'' + + ", maintTime=" + maintTime + + ", jobId=" + jobId + + ", timeLimit=" + timeLimit + + ", cyclePeriod=" + cyclePeriod + + ", maintStatus=" + maintStatus + + ", createMethod=" + createMethod + + ", isFlag=" + isFlag + + ", cronExpression='" + cronExpression + '\'' + + ", dmsPlanMaintDetailList=" + dmsPlanMaintDetailList + + '}'; } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java index 4fc16dac..ea630da8 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java @@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 保养计划明细对象 dms_plan_maint_detail - * + * * @author xins * @date 2024-01-08 */ @@ -30,10 +30,12 @@ public class DmsPlanMaintDetail extends BaseEntity @Excel(name = "保养部位,关联dms_base_maint_station的maint_station_id") private Long maintStationId; - /** 保养标准 */ - @Excel(name = "保养标准") - private String maintProtocol; +// /** 保养标准 */ +// @Excel(name = "保养标准") +// private String maintProtocol; + @Excel(name = "保养标准id") + private Long maintStandardId; /** 操作描述 */ @Excel(name = "操作描述") private String operationDescription; @@ -42,66 +44,68 @@ public class DmsPlanMaintDetail extends BaseEntity @Excel(name = "是否标识：1-是；2-否") private Long isFlag; - public void setPlanMaintDetailId(Long planMaintDetailId) + public Long getMaintStandardId() { + return maintStandardId; + } + + public void setMaintStandardId(Long maintStandardId) { + this.maintStandardId = maintStandardId; + } + + public void setPlanMaintDetailId(Long planMaintDetailId) { this.planMaintDetailId = planMaintDetailId; } - public Long getPlanMaintDetailId() + public Long getPlanMaintDetailId() { return planMaintDetailId; } - public void setPlanMaintId(Long planMaintId) + public void setPlanMaintId(Long planMaintId) { this.planMaintId = planMaintId; } - public Long getPlanMaintId() + public Long getPlanMaintId() { return planMaintId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(Long deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public Long getDeviceId() { return deviceId; } - public void setMaintStationId(Long maintStationId) + public void setMaintStationId(Long maintStationId) { this.maintStationId = maintStationId; } - public Long getMaintStationId() + public Long getMaintStationId() { return maintStationId; } - public void setMaintProtocol(String maintProtocol) - { - this.maintProtocol = maintProtocol; - } - public String getMaintProtocol() - { - return maintProtocol; - } - public void setOperationDescription(String operationDescription) + + + public void setOperationDescription(String operationDescription) { this.operationDescription = operationDescription; } - public String getOperationDescription() + public String getOperationDescription() { return operationDescription; } - public void setIsFlag(Long isFlag) + public void setIsFlag(Long isFlag) { this.isFlag = isFlag; } - public Long getIsFlag() + public Long getIsFlag() { return isFlag; } @@ -113,7 +117,6 @@ public class DmsPlanMaintDetail extends BaseEntity .append("planMaintId", getPlanMaintId()) .append("deviceId", getDeviceId()) .append("maintStationId", getMaintStationId()) - .append("maintProtocol", getMaintProtocol()) .append("operationDescription", getOperationDescription()) .append("isFlag", getIsFlag()) .append("remark", getRemark()) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java index 5b37e760..883ad94b 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBillsFaultInstance; /** * 检修工单Mapper接口 - * + * * @author Open Platform * @date 2024-01-23 */ -public interface DmsBillsFaultInstanceMapper +public interface DmsBillsFaultInstanceMapper { /** * 查询检修工单 - * + * * @param repairInstanceId 检修工单主键 * @return 检修工单 */ @@ -21,7 +21,7 @@ public interface DmsBillsFaultInstanceMapper /** * 查询检修工单列表 - * + * * @param dmsBillsFaultInstance 检修工单 * @return 检修工单集合 */ @@ -29,7 +29,7 @@ public interface DmsBillsFaultInstanceMapper /** * 新增检修工单 - * + * * @param dmsBillsFaultInstance 检修工单 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsBillsFaultInstanceMapper /** * 修改检修工单 - * + * * @param dmsBillsFaultInstance 检修工单 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsBillsFaultInstanceMapper /** * 删除检修工单 - * + * * @param repairInstanceId 检修工单主键 * @return 结果 */ @@ -53,9 +53,13 @@ public interface DmsBillsFaultInstanceMapper /** * 批量删除检修工单 - * + * * @param repairInstanceIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsBillsFaultInstanceByRepairInstanceIds(Long[] repairInstanceIds); + + public Long selectProcessActivityId(Long wfProcessId); } + + diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java index 774d2e08..65e1ecd1 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java @@ -59,4 +59,8 @@ public interface DmsBillsInspectInstanceMapper * @return 结果 */ public int deleteDmsBillsInspectInstanceByInspectInstanceIds(Long[] inspectInstanceIds); + + int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance); + + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java index f035edd6..97106c3a 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBillsLubeInstance; /** * 润滑工单Mapper接口 - * + * * @author Open Platform * @date 2024-02-26 */ -public interface DmsBillsLubeInstanceMapper +public interface DmsBillsLubeInstanceMapper { /** * 查询润滑工单 - * + * * @param lubeInstanceId 润滑工单主键 * @return 润滑工单 */ @@ -21,7 +21,7 @@ public interface DmsBillsLubeInstanceMapper /** * 查询润滑工单列表 - * + * * @param dmsBillsLubeInstance 润滑工单 * @return 润滑工单集合 */ @@ -29,7 +29,7 @@ public interface DmsBillsLubeInstanceMapper /** * 新增润滑工单 - * + * * @param dmsBillsLubeInstance 润滑工单 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsBillsLubeInstanceMapper /** * 修改润滑工单 - * + * * @param dmsBillsLubeInstance 润滑工单 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsBillsLubeInstanceMapper /** * 删除润滑工单 - * + * * @param lubeInstanceId 润滑工单主键 * @return 结果 */ @@ -53,9 +53,10 @@ public interface DmsBillsLubeInstanceMapper /** * 批量删除润滑工单 - * + * * @param lubeInstanceIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsBillsLubeInstanceByLubeInstanceIds(Long[] lubeInstanceIds); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintInstanceMapper.java new file mode 100644 index 00000000..e4ac689a --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintInstanceMapper.java @@ -0,0 +1,61 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsBillsMaintInstance; + +/** + * 保养工单Mapper接口 + * + * @author Open Platform + * @date 2024-02-29 + */ +public interface DmsBillsMaintInstanceMapper +{ + /** + * 查询保养工单 + * + * @param maintInstanceId 保养工单主键 + * @return 保养工单 + */ + public DmsBillsMaintInstance selectDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId); + + /** + * 查询保养工单列表 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 保养工单集合 + */ + public List selectDmsBillsMaintInstanceList(DmsBillsMaintInstance dmsBillsMaintInstance); + + /** + * 新增保养工单 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 结果 + */ + public int insertDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); + + /** + * 修改保养工单 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 结果 + */ + public int updateDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); + + /** + * 删除保养工单 + * + * @param maintInstanceId 保养工单主键 + * @return 结果 + */ + public int deleteDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId); + + /** + * 批量删除保养工单 + * + * @param maintInstanceIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsBillsMaintInstanceByMaintInstanceIds(Long[] maintInstanceIds); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsFaultInstanceActivityMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsFaultInstanceActivityMapper.java index 3a2e0ab9..e3023d2c 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsFaultInstanceActivityMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsFaultInstanceActivityMapper.java @@ -60,4 +60,5 @@ public interface DmsFaultInstanceActivityMapper public int deleteDmsFaultInstanceActivityByInstanceActivityIds(Long[] instanceActivityIds); Long[] selectUserIdByDmsFaultInstanceActivity(Long repairInstanceId); + DmsFaultInstanceActivity selectDmsFaultInstanceActivityByRepairIdMin(Long repairInstanceId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsFaultInstanceFileMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsFaultInstanceFileMapper.java new file mode 100644 index 00000000..1a4993c5 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsFaultInstanceFileMapper.java @@ -0,0 +1,66 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsFaultInstanceFile; + +/** + * 故障文件;手工创建，从故障报修开始Mapper接口 + * + * @author Open Platform + * @date 2024-02-29 + */ +public interface DmsFaultInstanceFileMapper +{ + /** + * 查询故障文件;手工创建，从故障报修开始 + * + * @param repairInstanceFileId 故障文件;手工创建，从故障报修开始主键 + * @return 故障文件;手工创建，从故障报修开始 + */ + public DmsFaultInstanceFile selectDmsFaultInstanceFileByRepairInstanceFileId(Long repairInstanceFileId); + + /** + * 查询故障文件;手工创建，从故障报修开始列表 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 故障文件;手工创建，从故障报修开始集合 + */ + public List selectDmsFaultInstanceFileList(DmsFaultInstanceFile dmsFaultInstanceFile); + + /** + * 新增故障文件;手工创建，从故障报修开始 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 结果 + */ + public int insertDmsFaultInstanceFile(DmsFaultInstanceFile dmsFaultInstanceFile); + + /** + * 修改故障文件;手工创建，从故障报修开始 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 结果 + */ + public int updateDmsFaultInstanceFile(DmsFaultInstanceFile dmsFaultInstanceFile); + + /** + * 删除故障文件;手工创建，从故障报修开始 + * + * @param repairInstanceFileId 故障文件;手工创建，从故障报修开始主键 + * @return 结果 + */ + public int deleteDmsFaultInstanceFileByRepairInstanceFileId(Long repairInstanceFileId); + + /** + * 批量删除故障文件;手工创建，从故障报修开始 + * + * @param repairInstanceFileIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsFaultInstanceFileByRepairInstanceFileIds(Long[] repairInstanceFileIds); + + /** + * 通过工单id查询故障文件 + * */ + List selectDmsFaultInstanceFileByFaultId(Long repairInstanceId); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsMaintInstanceActivityMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsMaintInstanceActivityMapper.java new file mode 100644 index 00000000..18ee3ca7 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsMaintInstanceActivityMapper.java @@ -0,0 +1,63 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsMaintInstanceActivity; + +/** + * 保养工单实例节点Mapper接口 + * + * @author Open Platform + * @date 2024-02-29 + */ +public interface DmsMaintInstanceActivityMapper +{ + /** + * 查询保养工单实例节点 + * + * @param instanceActivityId 保养工单实例节点主键 + * @return 保养工单实例节点 + */ + public DmsMaintInstanceActivity selectDmsMaintInstanceActivityByInstanceActivityId(Long instanceActivityId); + + /** + * 查询保养工单实例节点列表 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 保养工单实例节点集合 + */ + public List selectDmsMaintInstanceActivityList(DmsMaintInstanceActivity dmsMaintInstanceActivity); + + /** + * 新增保养工单实例节点 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 结果 + */ + public int insertDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity); + + /** + * 修改保养工单实例节点 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 结果 + */ + public int updateDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity); + + /** + * 删除保养工单实例节点 + * + * @param instanceActivityId 保养工单实例节点主键 + * @return 结果 + */ + public int deleteDmsMaintInstanceActivityByInstanceActivityId(Long instanceActivityId); + + /** + * 批量删除保养工单实例节点 + * + * @param instanceActivityIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsMaintInstanceActivityByInstanceActivityIds(Long[] instanceActivityIds); + + Long[] selectUserIdByDmsMaintInstanceActivityId(Long maintInstanceId); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java index e17b3a57..aba7a396 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBillsFaultInstance; /** * 检修工单Service接口 - * + * * @author Open Platform * @date 2024-01-23 */ -public interface IDmsBillsFaultInstanceService +public interface IDmsBillsFaultInstanceService { /** * 查询检修工单 - * + * * @param repairInstanceId 检修工单主键 * @return 检修工单 */ @@ -21,7 +21,7 @@ public interface IDmsBillsFaultInstanceService /** * 查询检修工单列表 - * + * * @param dmsBillsFaultInstance 检修工单 * @return 检修工单集合 */ @@ -29,7 +29,7 @@ public interface IDmsBillsFaultInstanceService /** * 新增检修工单 - * + * * @param dmsBillsFaultInstance 检修工单 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsBillsFaultInstanceService /** * 修改检修工单 - * + * * @param dmsBillsFaultInstance 检修工单 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsBillsFaultInstanceService /** * 批量删除检修工单 - * + * * @param repairInstanceIds 需要删除的检修工单主键集合 * @return 结果 */ @@ -53,9 +53,11 @@ public interface IDmsBillsFaultInstanceService /** * 删除检修工单信息 - * + * * @param repairInstanceId 检修工单主键 * @return 结果 */ public int deleteDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId); + + int insertDmsBillsFaultInstancePDA(DmsBillsFaultInstance dmsBillsFaultInstance); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java index 25ed6444..22504e7d 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java @@ -62,4 +62,6 @@ public interface IDmsBillsInspectInstanceService * @return 结果 */ public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); + + int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java index a54ef91a..0de50b13 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBillsLubeInstance; /** * 润滑工单Service接口 - * + * * @author Open Platform * @date 2024-02-26 */ -public interface IDmsBillsLubeInstanceService +public interface IDmsBillsLubeInstanceService { /** * 查询润滑工单 - * + * * @param lubeInstanceId 润滑工单主键 * @return 润滑工单 */ @@ -21,7 +21,7 @@ public interface IDmsBillsLubeInstanceService /** * 查询润滑工单列表 - * + * * @param dmsBillsLubeInstance 润滑工单 * @return 润滑工单集合 */ @@ -29,7 +29,7 @@ public interface IDmsBillsLubeInstanceService /** * 新增润滑工单 - * + * * @param dmsBillsLubeInstance 润滑工单 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsBillsLubeInstanceService /** * 修改润滑工单 - * + * * @param dmsBillsLubeInstance 润滑工单 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsBillsLubeInstanceService /** * 批量删除润滑工单 - * + * * @param lubeInstanceIds 需要删除的润滑工单主键集合 * @return 结果 */ @@ -53,9 +53,12 @@ public interface IDmsBillsLubeInstanceService /** * 删除润滑工单信息 - * + * * @param lubeInstanceId 润滑工单主键 * @return 结果 */ public int deleteDmsBillsLubeInstanceByLubeInstanceId(Long lubeInstanceId); + + int insertDmsBillsLubeInstancePDA(DmsBillsLubeInstance dmsBillsLubeInstance); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsMaintInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsMaintInstanceService.java new file mode 100644 index 00000000..2c3bbe86 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsMaintInstanceService.java @@ -0,0 +1,63 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsBillsMaintInstance; + +/** + * 保养工单Service接口 + * + * @author Open Platform + * @date 2024-02-29 + */ +public interface IDmsBillsMaintInstanceService +{ + /** + * 查询保养工单 + * + * @param maintInstanceId 保养工单主键 + * @return 保养工单 + */ + public DmsBillsMaintInstance selectDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId); + + /** + * 查询保养工单列表 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 保养工单集合 + */ + public List selectDmsBillsMaintInstanceList(DmsBillsMaintInstance dmsBillsMaintInstance); + + /** + * 新增保养工单 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 结果 + */ + public int insertDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); + + /** + * 修改保养工单 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 结果 + */ + public int updateDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); + + /** + * 批量删除保养工单 + * + * @param maintInstanceIds 需要删除的保养工单主键集合 + * @return 结果 + */ + public int deleteDmsBillsMaintInstanceByMaintInstanceIds(Long[] maintInstanceIds); + + /** + * 删除保养工单信息 + * + * @param maintInstanceId 保养工单主键 + * @return 结果 + */ + public int deleteDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId); + + int insertDmsBillsMaintInstancePDA(DmsBillsMaintInstance dmsBillsMaintInstance); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsFaultInstanceFileService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsFaultInstanceFileService.java new file mode 100644 index 00000000..3cea41f5 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsFaultInstanceFileService.java @@ -0,0 +1,61 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsFaultInstanceFile; + +/** + * 故障文件;手工创建，从故障报修开始Service接口 + * + * @author Open Platform + * @date 2024-02-29 + */ +public interface IDmsFaultInstanceFileService +{ + /** + * 查询故障文件;手工创建，从故障报修开始 + * + * @param repairInstanceFileId 故障文件;手工创建，从故障报修开始主键 + * @return 故障文件;手工创建，从故障报修开始 + */ + public DmsFaultInstanceFile selectDmsFaultInstanceFileByRepairInstanceFileId(Long repairInstanceFileId); + + /** + * 查询故障文件;手工创建，从故障报修开始列表 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 故障文件;手工创建，从故障报修开始集合 + */ + public List selectDmsFaultInstanceFileList(DmsFaultInstanceFile dmsFaultInstanceFile); + + /** + * 新增故障文件;手工创建，从故障报修开始 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 结果 + */ + public int insertDmsFaultInstanceFile(DmsFaultInstanceFile dmsFaultInstanceFile); + + /** + * 修改故障文件;手工创建，从故障报修开始 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 结果 + */ + public int updateDmsFaultInstanceFile(DmsFaultInstanceFile dmsFaultInstanceFile); + + /** + * 批量删除故障文件;手工创建，从故障报修开始 + * + * @param repairInstanceFileIds 需要删除的故障文件;手工创建，从故障报修开始主键集合 + * @return 结果 + */ + public int deleteDmsFaultInstanceFileByRepairInstanceFileIds(Long[] repairInstanceFileIds); + + /** + * 删除故障文件;手工创建，从故障报修开始信息 + * + * @param repairInstanceFileId 故障文件;手工创建，从故障报修开始主键 + * @return 结果 + */ + public int deleteDmsFaultInstanceFileByRepairInstanceFileId(Long repairInstanceFileId); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsMaintInstanceActivityService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsMaintInstanceActivityService.java new file mode 100644 index 00000000..6c7a25fe --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsMaintInstanceActivityService.java @@ -0,0 +1,65 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsMaintInstanceActivity; + +/** + * 保养工单实例节点Service接口 + * + * @author Open Platform + * @date 2024-02-29 + */ +public interface IDmsMaintInstanceActivityService +{ + /** + * 查询保养工单实例节点 + * + * @param instanceActivityId 保养工单实例节点主键 + * @return 保养工单实例节点 + */ + public DmsMaintInstanceActivity selectDmsMaintInstanceActivityByInstanceActivityId(Long instanceActivityId); + + /** + * 查询保养工单实例节点列表 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 保养工单实例节点集合 + */ + public List selectDmsMaintInstanceActivityList(DmsMaintInstanceActivity dmsMaintInstanceActivity); + + /** + * 新增保养工单实例节点 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 结果 + */ + public int insertDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity); + + /** + * 修改保养工单实例节点 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 结果 + */ + public int updateDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity); + + /** + * 批量删除保养工单实例节点 + * + * @param instanceActivityIds 需要删除的保养工单实例节点主键集合 + * @return 结果 + */ + public int deleteDmsMaintInstanceActivityByInstanceActivityIds(Long[] instanceActivityIds); + + /** + * 删除保养工单实例节点信息 + * + * @param instanceActivityId 保养工单实例节点主键 + * @return 结果 + */ + public int deleteDmsMaintInstanceActivityByInstanceActivityId(Long instanceActivityId); + + boolean selectUserIdByDmsMaintInstanceActivityId(Long maintInstanceId,Long userId); + + +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRepairInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRepairInstanceService.java index f86576dc..c14a2829 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRepairInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRepairInstanceService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsRepairInstance; /** * 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单Service接口 - * + * * @author Open Platform * @date 2024-01-24 */ -public interface IDmsRepairInstanceService +public interface IDmsRepairInstanceService { /** * 查询检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 - * + * * @param repairInstanceId 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单主键 * @return 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 */ @@ -21,7 +21,7 @@ public interface IDmsRepairInstanceService /** * 查询检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单列表 - * + * * @param dmsRepairInstance 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 * @return 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单集合 */ @@ -29,7 +29,7 @@ public interface IDmsRepairInstanceService /** * 新增检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 - * + * * @param dmsRepairInstance 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsRepairInstanceService /** * 修改检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 - * + * * @param dmsRepairInstance 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsRepairInstanceService /** * 批量删除检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单 - * + * * @param repairInstanceIds 需要删除的检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单主键集合 * @return 结果 */ @@ -53,9 +53,11 @@ public interface IDmsRepairInstanceService /** * 删除检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单信息 - * + * * @param repairInstanceId 检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单主键 * @return 结果 */ public int deleteDmsRepairInstanceByRepairInstanceId(Long repairInstanceId); + + int insertDmsRepairInstancePDA(DmsRepairInstance dmsRepairInstance); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java index 2f45133a..6bc4c986 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -1,19 +1,28 @@ package com.hw.dms.service.impl; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; + +import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.domain.R; import com.hw.common.core.utils.DateUtils; import com.hw.dms.domain.DmsFaultInstanceActivity; +import com.hw.dms.domain.DmsFaultInstanceFile; import com.hw.dms.domain.DmsRepairInstanceActivity; import com.hw.dms.mapper.DmsFaultInstanceActivityMapper; +import com.hw.dms.mapper.DmsFaultInstanceFileMapper; import com.hw.dms.mapper.DmsRepairInstanceActivityMapper; import com.hw.dms.service.IDmsRepairInstanceActivityService; +import com.hw.system.api.RemoteSysCommonService; +import com.hw.system.api.domain.SysFile; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsBillsFaultInstanceMapper; import com.hw.dms.domain.DmsBillsFaultInstance; import com.hw.dms.service.IDmsBillsFaultInstanceService; +import org.springframework.transaction.annotation.Transactional; /** * 报修工单Service业务层处理 @@ -28,6 +37,10 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS private DmsBillsFaultInstanceMapper dmsBillsFaultInstanceMapper; @Autowired private DmsFaultInstanceActivityMapper dmsFaultInstanceActivityMapper; + @Autowired + private RemoteSysCommonService remoteSysCommonService; + @Autowired + private DmsFaultInstanceFileMapper dmsFaultInstanceFileMapper; /** * 查询报修工单 @@ -38,7 +51,27 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS @Override public DmsBillsFaultInstance selectDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId) { - return dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); + DmsFaultInstanceActivity dmsFaultInstanceActivity = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByRepairIdMin(repairInstanceId); + DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); + List dmsFaultInstanceFiles = dmsFaultInstanceFileMapper.selectDmsFaultInstanceFileByFaultId(repairInstanceId); + List sysFiles = new ArrayList(); + SysFile sysFile = new SysFile(); + dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType()); + dmsBillsFaultInstance.setFaultDescription(dmsFaultInstanceActivity.getFaultDescription()); + dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); + dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); + dmsBillsFaultInstance.setDeviceId(dmsFaultInstanceActivity.getDeviceId()); + dmsBillsFaultInstance.setRepairType(dmsFaultInstanceActivity.getRepairType()); + if (dmsFaultInstanceActivity.getOutsrcId()!=null) { + dmsBillsFaultInstance.setOutsrcId(dmsFaultInstanceActivity.getOutsrcId()); + } + for (DmsFaultInstanceFile dmsFaultFor : dmsFaultInstanceFiles){ + sysFile.setUrl(dmsFaultFor.getFaultFile()); + sysFiles.add(sysFile); + } + dmsBillsFaultInstance.setDmsFaultInstanceFiles(dmsFaultInstanceFiles); + dmsBillsFaultInstance.setSysFiles(sysFiles); + return dmsBillsFaultInstance; } /** @@ -50,6 +83,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS @Override public List selectDmsBillsFaultInstanceList(DmsBillsFaultInstance dmsBillsFaultInstance) { + return dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance); } @@ -60,12 +94,14 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmm"); String str = sdf.format(DateUtils.getNowDate()); LoginUser user = new LoginUser(); + dmsBillsFaultInstance.setWfProcessId(102l); dmsBillsFaultInstance.setApplyUser(user.getUsername()); dmsBillsFaultInstance.setApplyTime(DateUtils.getNowDate()); dmsBillsFaultInstance.setCreateTime(DateUtils.getNowDate()); @@ -73,10 +109,10 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS dmsBillsFaultInstance.setBillsStatus("0"); dmsBillsFaultInstance.setInstanceType("1"); int i = dmsBillsFaultInstanceMapper.insertDmsBillsFaultInstance(dmsBillsFaultInstance); - List dmsBillsFaultInstances = dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance); + Long aLong = dmsBillsFaultInstanceMapper.selectProcessActivityId(102l); DmsFaultInstanceActivity dmsFaultInstanceActivity = new DmsFaultInstanceActivity(); dmsFaultInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId()); - dmsFaultInstanceActivity.setProcessActivityId(102l); + dmsFaultInstanceActivity.setProcessActivityId(aLong); dmsFaultInstanceActivity.setFaultType(dmsBillsFaultInstance.getFaultType()); dmsFaultInstanceActivity.setFaultDescription(dmsBillsFaultInstance.getFaultDescription()); dmsFaultInstanceActivity.setDesignOperations(dmsBillsFaultInstance.getDesignOperations()); @@ -88,6 +124,14 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS dmsFaultInstanceActivity.setProcessHandleStatus("2"); dmsFaultInstanceActivity.setProcessStepOrder(1l); dmsFaultInstanceActivityMapper.insertDmsFaultInstanceActivity(dmsFaultInstanceActivity); + //存储图片 + + DmsFaultInstanceFile dmsFaultInstanceFile = new DmsFaultInstanceFile(); + if (dmsBillsFaultInstance.getImgUrl()!=""&&dmsBillsFaultInstance.getImgUrl()!=null){ + dmsFaultInstanceFile.setTargetId(dmsFaultInstanceActivity.getInstanceActivityId()); + dmsFaultInstanceFile.setTargetType("1"); + dmsFaultInstanceFile.setFaultFile(dmsBillsFaultInstance.getImgUrl()); + dmsFaultInstanceFileMapper.insertDmsFaultInstanceFile(dmsFaultInstanceFile);} return i; } @@ -127,4 +171,27 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS { return dmsBillsFaultInstanceMapper.deleteDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); } + /** + * pda-新增报修工单 + * */ + public int insertDmsBillsFaultInstancePDA(DmsBillsFaultInstance dmsBillsFaultInstance){ + //根据报修流程查询工单流程节点id + Long aLong = dmsBillsFaultInstanceMapper.selectProcessActivityId(102l); + int i = dmsBillsFaultInstanceMapper.insertDmsBillsFaultInstance(dmsBillsFaultInstance); + DmsFaultInstanceActivity dmsFaultInstanceActivity = new DmsFaultInstanceActivity(); + //生成故障报修工单实例节点第一步 + dmsFaultInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId()); + dmsFaultInstanceActivity.setFaultType(dmsBillsFaultInstance.getFaultType()); + dmsFaultInstanceActivity.setFaultDescription(dmsBillsFaultInstance.getFaultDescription()); + dmsFaultInstanceActivity.setDesignOperations(dmsBillsFaultInstance.getDesignOperations()); + dmsFaultInstanceActivity.setDeviceId(dmsBillsFaultInstance.getDeviceId()); + dmsFaultInstanceActivity.setRepairType(dmsBillsFaultInstance.getRepairType()); + dmsFaultInstanceActivity.setOutsrcId(dmsBillsFaultInstance.getOutsrcId()); + dmsFaultInstanceActivity.setProcessActivityId(aLong); + dmsFaultInstanceActivity.setProcessStepOrder(1l); + dmsFaultInstanceActivity.setCreateTime(DateUtils.getNowDate()); + dmsFaultInstanceActivityMapper.insertDmsFaultInstanceActivity(dmsFaultInstanceActivity); + return i; + } + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java index 49a32226..c3743bd9 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java @@ -1,10 +1,14 @@ package com.hw.dms.service.impl; +import java.text.SimpleDateFormat; import java.util.List; + +import com.hw.common.core.constant.SecurityConstants; import com.hw.common.core.utils.DateUtils; import com.hw.dms.domain.DmsBillsInspectInstanceActivity; import com.hw.dms.mapper.DmsBillsInspectInstanceActivityMapper; import com.hw.dms.mapper.DmsRepairInstanceMapper; +import com.hw.system.api.RemoteSysCommonService; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +31,8 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta private DmsBillsInspectInstanceActivityMapper dmsBillsInspectInstanceActivityMapper; @Autowired private DmsRepairInstanceMapper dmsRepairInstanceMapper; + @Autowired + private RemoteSysCommonService remoteSysCommonService; /** * 查询巡检工单 @@ -74,7 +80,11 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta LoginUser user = new LoginUser(); //写死105，也可根据传入对象的wfprocessid作为传参。 Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l); - dmsBillsInspectInstance.setWfProcessId(105l); + if (dmsBillsInspectInstance.getInspectType().equals("1")){ + dmsBillsInspectInstance.setWfProcessId(105l); + }else if (dmsBillsInspectInstance.getInspectType().equals("2")){ + dmsBillsInspectInstance.setWfProcessId(104l); + } dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate()); dmsBillsInspectInstance.setIsFlag("1"); dmsBillsInspectInstance.setCreateBy(user.getUsername()); @@ -128,4 +138,37 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta { return dmsBillsInspectInstanceMapper.deleteDmsBillsInspectInstanceByInspectInstanceId(inspectInstanceId); } + + @Override + public int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance) { + Long along = null; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); + if (dmsBillsInspectInstance.getInspectType().equals("1")){ + dmsBillsInspectInstance.setWfProcessId(105l); + along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER,105l); + } + else if (dmsBillsInspectInstance.getInspectType().equals("2")){ + dmsBillsInspectInstance.setWfProcessId(104l); + along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER,104l); + + } + dmsBillsInspectInstance.setBillsInspectCode(sdf.format(DateUtils.getNowDate())); + dmsBillsInspectInstance.setInspectStatus("1"); + dmsBillsInspectInstance.setIsFlag("1"); + //创建点巡检工单实例节点第一步 + int i = dmsBillsInspectInstanceMapper.insertDmsBillsInspectInstance(dmsBillsInspectInstance); + + DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity = new DmsBillsInspectInstanceActivity(); + dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstance.getInspectInstanceId()); + dmsBillsInspectInstanceActivity.setProcessStepOrder(1l); + dmsBillsInspectInstanceActivity.setProcessActivityId(along); + dmsBillsInspectInstanceActivity.setInspectRouteId(dmsBillsInspectInstance.getInspectRouteId()); + dmsBillsInspectInstanceActivity.setDeviceAmount(dmsBillsInspectInstance.getDeviceAmount()); + dmsBillsInspectInstanceActivity.setPerformer(dmsBillsInspectInstance.getPerformer()); + dmsBillsInspectInstanceActivity.setProcessHandleStatus("1"); + dmsBillsInspectInstanceActivityMapper.insertDmsBillsInspectInstanceActivity(dmsBillsInspectInstanceActivity); + return 0; + } + + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java index e6a97457..6c981bb9 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java @@ -1,12 +1,16 @@ package com.hw.dms.service.impl; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; + +import com.hw.common.core.constant.SecurityConstants; import com.hw.common.core.utils.DateUtils; import com.hw.dms.domain.DmsBillsLubeInstanceActivity; import com.hw.dms.domain.DmsPlanLube; import com.hw.dms.mapper.DmsBillsLubeInstanceActivityMapper; import com.hw.dms.mapper.DmsPlanLubeMapper; +import com.hw.system.api.RemoteSysCommonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsBillsLubeInstanceMapper; @@ -31,6 +35,8 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer @Autowired private DmsBillsLubeInstanceActivityMapper dmsBillsLubeInstanceActivityMapper;; + @Autowired + private RemoteSysCommonService remoteSysCommonService; /** * 查询润滑工单 * @@ -82,7 +88,6 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer dmsBillsLubeInstanceActivity.setLubeSupervisor(dmsPlanLube.getLubeSupervisor()); dmsBillsLubeInstanceActivity.setLubeLevel(dmsPlanLube.getLubeLevel()); dmsBillsLubeInstanceActivity.setProcessStepOrder(1l); - dmsBillsLubeInstanceActivity.setProcessHandleResolution("无"); dmsBillsLubeInstanceActivityMapper.insertDmsBillsLubeInstanceActivity(dmsBillsLubeInstanceActivity); return i; } @@ -123,4 +128,22 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer { return dmsBillsLubeInstanceMapper.deleteDmsBillsLubeInstanceByLubeInstanceId(lubeInstanceId); } + + @Override + public int insertDmsBillsLubeInstancePDA(DmsBillsLubeInstance dmsBillsLubeInstance) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); + Long aLong= remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 106l); + dmsBillsLubeInstance.setBillsLubeCode(sdf.format(DateUtils.getNowDate())); + dmsBillsLubeInstance.setLubeStatus("1"); + dmsBillsLubeInstance.setIsFlag("1"); + //创建润滑工单实例节点 + DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity = new DmsBillsLubeInstanceActivity(); + dmsBillsLubeInstanceActivity.setLubeInstanceId(dmsBillsLubeInstance.getLubeInstanceId()); + dmsBillsLubeInstanceActivity.setProcessActivityId(aLong); + dmsBillsLubeInstanceActivity.setLubeGroup(dmsBillsLubeInstance.getLubeGroup()); + dmsBillsLubeInstanceActivity.setLubeLevel(dmsBillsLubeInstance.getLubeLevel()); + dmsBillsLubeInstanceActivity.setLubeSupervisor(dmsBillsLubeInstance.getLubeSupervisor()); + + return 0; + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java new file mode 100644 index 00000000..83237666 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java @@ -0,0 +1,153 @@ +package com.hw.dms.service.impl; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.utils.DateUtils; +import com.hw.dms.domain.DmsMaintInstanceActivity; +import com.hw.dms.domain.DmsPlanMaint; +import com.hw.dms.mapper.DmsMaintInstanceActivityMapper; +import com.hw.dms.mapper.DmsPlanMaintMapper; +import com.hw.system.api.RemoteSysCommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.dms.mapper.DmsBillsMaintInstanceMapper; +import com.hw.dms.domain.DmsBillsMaintInstance; +import com.hw.dms.service.IDmsBillsMaintInstanceService; + +/** + * 保养工单Service业务层处理 + * + * @author Open Platform + * @date 2024-02-29 + */ +@Service +public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceService +{ + @Autowired + private DmsBillsMaintInstanceMapper dmsBillsMaintInstanceMapper; + @Autowired + private DmsPlanMaintMapper dmsPlanMaintMapper; + @Autowired + private DmsMaintInstanceActivityMapper dmsMaintInstanceActivityMapper; + @Autowired + private RemoteSysCommonService remoteSysCommonService; + + /** + * 查询保养工单 + * + * @param maintInstanceId 保养工单主键 + * @return 保养工单 + */ + @Override + public DmsBillsMaintInstance selectDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId) + { + return dmsBillsMaintInstanceMapper.selectDmsBillsMaintInstanceByMaintInstanceId(maintInstanceId); + } + + /** + * 查询保养工单列表 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 保养工单 + */ + @Override + public List selectDmsBillsMaintInstanceList(DmsBillsMaintInstance dmsBillsMaintInstance) + { + return dmsBillsMaintInstanceMapper.selectDmsBillsMaintInstanceList(dmsBillsMaintInstance); + } + + /** + * 新增保养工单 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 结果 + */ + @Override + public int insertDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance) + { + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmm"); + dmsBillsMaintInstance.setCreateTime(DateUtils.getNowDate()); + DmsPlanMaint dmsPlanMaint = dmsPlanMaintMapper.selectDmsPlanMaintByPlanMaintId(dmsBillsMaintInstance.getPlanMaintId()); + dmsBillsMaintInstance.setPlanBeginTime(dmsPlanMaint.getMaintTime()); + dmsBillsMaintInstance.setBillsMaintCode(sdf.format(DateUtils.getNowDate())); + dmsBillsMaintInstance.setMaintStatus(1l); + Date lubeTime = dmsPlanMaint.getMaintTime(); + Long timeLimit = dmsPlanMaint.getTimeLimit(); + dmsBillsMaintInstance.setIsFlag(1l); + dmsBillsMaintInstance.setWfProcessId(103l); + dmsBillsMaintInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit*1000l)); + int i = dmsBillsMaintInstanceMapper.insertDmsBillsMaintInstance(dmsBillsMaintInstance); + + DmsMaintInstanceActivity maintInstanceActivity = new DmsMaintInstanceActivity(); + maintInstanceActivity.setMaintInstanceId(dmsBillsMaintInstance.getMaintInstanceId()); + maintInstanceActivity.setProcessActivityId(103l); + maintInstanceActivity.setMaintLevel(dmsPlanMaint.getMaintLevel()); + maintInstanceActivity.setMaintGroup(dmsPlanMaint.getMaintGroup()); + maintInstanceActivity.setMaintSupervisor(dmsPlanMaint.getMaintSupervisor()); + maintInstanceActivity.setProcessStepOrder(1l); + dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(maintInstanceActivity); + return i; + } + + /** + * 修改保养工单 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 结果 + */ + @Override + public int updateDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance) + { + dmsBillsMaintInstance.setUpdateTime(DateUtils.getNowDate()); + return dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance); + } + + /** + * 批量删除保养工单 + * + * @param maintInstanceIds 需要删除的保养工单主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsMaintInstanceByMaintInstanceIds(Long[] maintInstanceIds) + { + return dmsBillsMaintInstanceMapper.deleteDmsBillsMaintInstanceByMaintInstanceIds(maintInstanceIds); + } + + /** + * 删除保养工单信息 + * + * @param maintInstanceId 保养工单主键 + * @return 结果 + */ + @Override + public int deleteDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId) + { + return dmsBillsMaintInstanceMapper.deleteDmsBillsMaintInstanceByMaintInstanceId(maintInstanceId); + } + + @Override + public int insertDmsBillsMaintInstancePDA(DmsBillsMaintInstance dmsBillsMaintInstance) { + Long aLong= remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 103l); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); + dmsBillsMaintInstance.setWfProcessId(103l); + dmsBillsMaintInstance.setBillsMaintCode(sdf.format(DateUtils.getNowDate())); + dmsBillsMaintInstance.setMaintStatus(1l); + dmsBillsMaintInstance.setIsFlag(1l); + int i = dmsBillsMaintInstanceMapper.insertDmsBillsMaintInstance(dmsBillsMaintInstance); + //创建保养工单实例节点第一步 + DmsMaintInstanceActivity dmsMaintInstanceActivity = new DmsMaintInstanceActivity(); + dmsMaintInstanceActivity.setMaintInstanceId(dmsBillsMaintInstance.getMaintInstanceId()); + dmsMaintInstanceActivity.setProcessActivityId(aLong); + dmsMaintInstanceActivity.setMaintGroup(dmsBillsMaintInstance.getMaintGroup()); + dmsMaintInstanceActivity.setMaintLevel(dmsBillsMaintInstance.getMaintLevel()); + dmsMaintInstanceActivity.setMaintSupervisor(dmsBillsMaintInstance.getMaintSupervisor()); + dmsMaintInstanceActivity.setProcessStepOrder(1l); + dmsMaintInstanceActivity.setProcessHandleStatus("1"); + dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity); + return i; + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceFileServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceFileServiceImpl.java new file mode 100644 index 00000000..c4704f19 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceFileServiceImpl.java @@ -0,0 +1,95 @@ +package com.hw.dms.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.dms.mapper.DmsFaultInstanceFileMapper; +import com.hw.dms.domain.DmsFaultInstanceFile; +import com.hw.dms.service.IDmsFaultInstanceFileService; + +/** + * 故障文件;手工创建，从故障报修开始Service业务层处理 + * + * @author Open Platform + * @date 2024-02-29 + */ +@Service +public class DmsFaultInstanceFileServiceImpl implements IDmsFaultInstanceFileService +{ + @Autowired + private DmsFaultInstanceFileMapper dmsFaultInstanceFileMapper; + + /** + * 查询故障文件;手工创建，从故障报修开始 + * + * @param repairInstanceFileId 故障文件;手工创建，从故障报修开始主键 + * @return 故障文件;手工创建，从故障报修开始 + */ + @Override + public DmsFaultInstanceFile selectDmsFaultInstanceFileByRepairInstanceFileId(Long repairInstanceFileId) + { + return dmsFaultInstanceFileMapper.selectDmsFaultInstanceFileByRepairInstanceFileId(repairInstanceFileId); + } + + /** + * 查询故障文件;手工创建，从故障报修开始列表 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 故障文件;手工创建，从故障报修开始 + */ + @Override + public List selectDmsFaultInstanceFileList(DmsFaultInstanceFile dmsFaultInstanceFile) + { + return dmsFaultInstanceFileMapper.selectDmsFaultInstanceFileList(dmsFaultInstanceFile); + } + + /** + * 新增故障文件;手工创建，从故障报修开始 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 结果 + */ + @Override + public int insertDmsFaultInstanceFile(DmsFaultInstanceFile dmsFaultInstanceFile) + { + if (dmsFaultInstanceFile!=null){ + return dmsFaultInstanceFileMapper.insertDmsFaultInstanceFile(dmsFaultInstanceFile);} + return 0; + } + + /** + * 修改故障文件;手工创建，从故障报修开始 + * + * @param dmsFaultInstanceFile 故障文件;手工创建，从故障报修开始 + * @return 结果 + */ + @Override + public int updateDmsFaultInstanceFile(DmsFaultInstanceFile dmsFaultInstanceFile) + { + return dmsFaultInstanceFileMapper.updateDmsFaultInstanceFile(dmsFaultInstanceFile); + } + + /** + * 批量删除故障文件;手工创建，从故障报修开始 + * + * @param repairInstanceFileIds 需要删除的故障文件;手工创建，从故障报修开始主键 + * @return 结果 + */ + @Override + public int deleteDmsFaultInstanceFileByRepairInstanceFileIds(Long[] repairInstanceFileIds) + { + return dmsFaultInstanceFileMapper.deleteDmsFaultInstanceFileByRepairInstanceFileIds(repairInstanceFileIds); + } + + /** + * 删除故障文件;手工创建，从故障报修开始信息 + * + * @param repairInstanceFileId 故障文件;手工创建，从故障报修开始主键 + * @return 结果 + */ + @Override + public int deleteDmsFaultInstanceFileByRepairInstanceFileId(Long repairInstanceFileId) + { + return dmsFaultInstanceFileMapper.deleteDmsFaultInstanceFileByRepairInstanceFileId(repairInstanceFileId); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java new file mode 100644 index 00000000..f74fddf6 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java @@ -0,0 +1,164 @@ +package com.hw.dms.service.impl; + +import java.util.Arrays; +import java.util.List; +import com.hw.common.core.utils.DateUtils; +import com.hw.dms.domain.DmsBillsMaintInstance; +import com.hw.dms.domain.DmsRepairInstance; +import com.hw.dms.domain.DmsRepairInstanceActivity; +import com.hw.dms.mapper.DmsBillsMaintInstanceMapper; +import com.hw.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.dms.mapper.DmsMaintInstanceActivityMapper; +import com.hw.dms.domain.DmsMaintInstanceActivity; +import com.hw.dms.service.IDmsMaintInstanceActivityService; + +/** + * 保养工单实例节点Service业务层处理 + * + * @author Open Platform + * @date 2024-02-29 + */ +@Service +public class DmsMaintInstanceActivityServiceImpl implements IDmsMaintInstanceActivityService +{ + @Autowired + private DmsMaintInstanceActivityMapper dmsMaintInstanceActivityMapper; + @Autowired + private DmsBillsMaintInstanceMapper dmsBillsMaintInstanceMapper; + + /** + * 查询保养工单实例节点 + * + * @param instanceActivityId 保养工单实例节点主键 + * @return 保养工单实例节点 + */ + @Override + public DmsMaintInstanceActivity selectDmsMaintInstanceActivityByInstanceActivityId(Long instanceActivityId) + { + return dmsMaintInstanceActivityMapper.selectDmsMaintInstanceActivityByInstanceActivityId(instanceActivityId); + } + + /** + * 查询保养工单实例节点列表 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 保养工单实例节点 + */ + @Override + public List selectDmsMaintInstanceActivityList(DmsMaintInstanceActivity dmsMaintInstanceActivity) + { + return dmsMaintInstanceActivityMapper.selectDmsMaintInstanceActivityList(dmsMaintInstanceActivity); + } + + /** + * 新增保养工单实例节点 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 结果 + */ + @Override + public int insertDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity) + { + LoginUser user = new LoginUser(); + dmsMaintInstanceActivity.setCreateBy(user.getUsername()); + dmsMaintInstanceActivity.setCreateTime(DateUtils.getNowDate()); + dmsMaintInstanceActivity.setStartTime(DateUtils.getNowDate()); + dmsMaintInstanceActivity.setProcessHandleStatus("2"); + //如果是最后一步，则添加一条检修记录（检修记录暂时不用) + //创建步骤2时修改步骤1的状态，处理人，处理时间等数据 + if (dmsMaintInstanceActivity.getProcessStepOrder()!=1){ + //最后一步 直接将 + if (dmsMaintInstanceActivity.getProcessStepOrder()==dmsMaintInstanceActivity.getWfLength()){ + dmsMaintInstanceActivity.setEndTime(DateUtils.getNowDate()); + dmsMaintInstanceActivity.setHandleUserId(user.getUserid()); + dmsMaintInstanceActivity.setHandleBy(user.getUsername()); + dmsMaintInstanceActivity.setHandleTime(DateUtils.getNowDate()); + DmsMaintInstanceActivity dms = new DmsMaintInstanceActivity(); + dms.setInstanceActivityId(dmsMaintInstanceActivity.getInstanceActivityId()); + List dmsMaintInstanceActivities = dmsMaintInstanceActivityMapper.selectDmsMaintInstanceActivityList(dms); + int i = dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity); + for (DmsMaintInstanceActivity dmsRepairInstanceActivityFor:dmsMaintInstanceActivities){ + dmsRepairInstanceActivityFor.setProcessHandleStatus("0"); + dmsMaintInstanceActivityMapper.updateDmsMaintInstanceActivity(dmsRepairInstanceActivityFor); + } + DmsBillsMaintInstance dmsBillsMaintInstance = dmsBillsMaintInstanceMapper.selectDmsBillsMaintInstanceByMaintInstanceId(dmsMaintInstanceActivity.getMaintInstanceId()); + dmsBillsMaintInstance.setBillsMaintCode("2"); + dmsBillsMaintInstance.setRealEndTime(DateUtils.getNowDate()); + dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance); + +// //更新本次计划时间，当上一个计划生成的工单结束时，本机计划时间为下一个计划工单的时间 +// DmsPlanRepair dmsPlanRepair = dmsPlanRepairMapper.selectDmsPlanRepairByPlanRepairId(dmsRepairInstance.getPlanRepairId()); +// //根据jobid获取cron表达式 +// String cron = dmsPlanRepairMapper.getCron(dmsPlanRepair.getJobId()); +// dmsPlanRepair.setRepairTime(CronUtils.getNextExecution(cron)); +// dmsPlanRepairMapper.updateDmsPlanRepair(dmsPlanRepair); + return i; + } + //中间步骤 + else { + if (dmsMaintInstanceActivity.getProcessStepOrder()==2){ + DmsBillsMaintInstance dmsBillsMaintInstance = dmsBillsMaintInstanceMapper.selectDmsBillsMaintInstanceByMaintInstanceId(dmsMaintInstanceActivity.getMaintInstanceId()); + dmsBillsMaintInstance.setRealBeginTime(DateUtils.getNowDate()); + dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance); + } + DmsMaintInstanceActivity dmsMaintInstanceActivityOrderSmall = new DmsMaintInstanceActivity(); + dmsMaintInstanceActivityOrderSmall.setMaintInstanceId(dmsMaintInstanceActivity.getMaintInstanceId()); + dmsMaintInstanceActivityOrderSmall.setProcessStepOrder(dmsMaintInstanceActivity.getProcessStepOrder() - 1); + List dmsMaintInstanceActivities = dmsMaintInstanceActivityMapper.selectDmsMaintInstanceActivityList(dmsMaintInstanceActivityOrderSmall); + dmsMaintInstanceActivities.get(0).setProcessHandleStatus("3"); + dmsMaintInstanceActivities.get(0).setEndTime(DateUtils.getNowDate()); + dmsMaintInstanceActivities.get(0).setHandleBy(user.getUsername()); + dmsMaintInstanceActivities.get(0).setHandleUserId(user.getUserid()); + dmsMaintInstanceActivityMapper.updateDmsMaintInstanceActivity(dmsMaintInstanceActivities.get(0)); + + + } + } + return dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity); + } + + /** + * 修改保养工单实例节点 + * + * @param dmsMaintInstanceActivity 保养工单实例节点 + * @return 结果 + */ + @Override + public int updateDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity) + { + return dmsMaintInstanceActivityMapper.updateDmsMaintInstanceActivity(dmsMaintInstanceActivity); + } + + /** + * 批量删除保养工单实例节点 + * + * @param instanceActivityIds 需要删除的保养工单实例节点主键 + * @return 结果 + */ + @Override + public int deleteDmsMaintInstanceActivityByInstanceActivityIds(Long[] instanceActivityIds) + { + return dmsMaintInstanceActivityMapper.deleteDmsMaintInstanceActivityByInstanceActivityIds(instanceActivityIds); + } + + /** + * 删除保养工单实例节点信息 + * + * @param instanceActivityId 保养工单实例节点主键 + * @return 结果 + */ + @Override + public int deleteDmsMaintInstanceActivityByInstanceActivityId(Long instanceActivityId) + { + return dmsMaintInstanceActivityMapper.deleteDmsMaintInstanceActivityByInstanceActivityId(instanceActivityId); + } + + @Override + public boolean selectUserIdByDmsMaintInstanceActivityId(Long maintInstanceId, Long userId) { + Long[] longs = dmsMaintInstanceActivityMapper.selectUserIdByDmsMaintInstanceActivityId(maintInstanceId); + boolean contains = Arrays.asList(longs).contains(userId); + return contains; + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java index 3a8adca3..f1da72a5 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.dms.domain.DmsPlanRepair; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,7 +35,19 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService @Override public DmsPlanMaint selectDmsPlanMaintByPlanMaintId(Long planMaintId) { - return dmsPlanMaintMapper.selectDmsPlanMaintByPlanMaintId(planMaintId); + DmsPlanMaint dmsPlanMaint = dmsPlanMaintMapper.selectDmsPlanMaintByPlanMaintId(planMaintId); + + + Long timeLimit = dmsPlanMaint.getTimeLimit(); + if (timeLimit !=null){ + Long days = timeLimit / (24 * 60 * 60l); + Long hours = timeLimit % (24 * 60 * 60l); +// System.out.println(days); +// System.out.println(hours); + dmsPlanMaint.setTimeLimitDays(days); + dmsPlanMaint.setTimeLimitHours(hours/(60*60l)); + } + return dmsPlanMaint; } /** @@ -46,7 +59,15 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService @Override public List selectDmsPlanMaintList(DmsPlanMaint dmsPlanMaint) { - return dmsPlanMaintMapper.selectDmsPlanMaintList(dmsPlanMaint); + + List dmsPlanMaints = dmsPlanMaintMapper.selectDmsPlanMaintList(dmsPlanMaint); + for (DmsPlanMaint d:dmsPlanMaints){ + Long timeLimit = d.getTimeLimit(); + d.setTimeLimitDays(timeLimit/(24*60*60L)); + d.setTimeLimitHours((timeLimit%(24*60*60L))/(60*60l)); + } + + return dmsPlanMaints; } /** @@ -59,6 +80,8 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService @Override public int insertDmsPlanMaint(DmsPlanMaint dmsPlanMaint) { + dmsPlanMaint.setTimeLimit((dmsPlanMaint.getTimeLimitDays()*24*60*60) + +(dmsPlanMaint.getTimeLimitHours()*60*60)); dmsPlanMaint.setIsFlag(1l); LoginUser user = new LoginUser(); dmsPlanMaint.setCreateBy(user.getUsername()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java index aac1d17d..5a9761e1 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java @@ -115,6 +115,7 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService } dmsRepairInstance.setApplyBy(user.getUsername()); dmsRepairInstance.setApplyTime(DateUtils.getNowDate()); + dmsRepairInstance.setWfProcessId(101l); int flag = dmsRepairInstanceMapper.insertDmsRepairInstance(dmsRepairInstance); //创建工单时新建工单实例节点 @@ -193,6 +194,29 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService return dmsRepairInstanceMapper.deleteDmsRepairInstanceByRepairInstanceId(repairInstanceId); } + @Override + public int insertDmsRepairInstancePDA(DmsRepairInstance dmsRepairInstance) { + Long aLong= remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 101l); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); + dmsRepairInstance.setWfProcessId(101l); + dmsRepairInstance.setBillsRepairCode(sdf.format(DateUtils.getNowDate())); + dmsRepairInstance.setBillsStatus("0"); + dmsRepairInstance.setInstanceType("1"); + dmsRepairInstance.setIsFlag("1"); + int i = dmsRepairInstanceMapper.insertDmsRepairInstance(dmsRepairInstance); + //创建工单实例节点 + DmsRepairInstanceActivity dmsRepairInstanceActivity = new DmsRepairInstanceActivity(); + dmsRepairInstanceActivity.setRepairInstanceId(dmsRepairInstance.getRepairInstanceId()); + dmsRepairInstanceActivity.setProcessActivityId(aLong); + dmsRepairInstanceActivity.setRepairType(dmsRepairInstance.getRepairType()); + dmsRepairInstanceActivity.setRepairGroup(dmsRepairInstance.getRepairGroup()); + dmsRepairInstanceActivity.setRepairSupervisor(dmsRepairInstance.getRepairSupervisor()); + dmsRepairInstanceActivity.setProcessStepOrder(1l); + dmsRepairInstanceActivity.setProcessHandleStatus("1"); + dmsRepairInstanceActivityMapper.insertDmsRepairInstanceActivity(dmsRepairInstanceActivity); + return i; + } + // public static void main(String[] args) { // // SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml index d8980ace..3db4c549 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml @@ -23,10 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select repair_instance_id, fault_source_type, fault_source_id, wf_process_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time from dms_bills_fault_instance + select repair_instance_id, fault_source_type, fault_source_id, wf_process_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time,device_id from dms_bills_fault_instance @@ -73,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + device_id, #{faultSourceType}, @@ -92,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{deviceId}, @@ -115,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + device_id = #{deviceId}, where repair_instance_id = #{repairInstanceId} @@ -129,4 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{repairInstanceId} + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml new file mode 100644 index 00000000..c2d8bf4d --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select maint_instance_id, plan_maint_id, wf_process_id, bills_maint_code, plan_begin_time, real_begin_time, plan_end_time, real_end_time, maint_status, maint_comp_rate, is_flag, remark, create_by, create_time, update_by, update_time from dms_bills_maint_instance + + + + + + + + insert into dms_bills_maint_instance + + plan_maint_id, + wf_process_id, + bills_maint_code, + plan_begin_time, + real_begin_time, + plan_end_time, + real_end_time, + maint_status, + maint_comp_rate, + is_flag, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{planMaintId}, + #{wfProcessId}, + #{billsMaintCode}, + #{planBeginTime}, + #{realBeginTime}, + #{planEndTime}, + #{realEndTime}, + #{maintStatus}, + #{maintCompRate}, + #{isFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dms_bills_maint_instance + + plan_maint_id = #{planMaintId}, + wf_process_id = #{wfProcessId}, + bills_maint_code = #{billsMaintCode}, + plan_begin_time = #{planBeginTime}, + real_begin_time = #{realBeginTime}, + plan_end_time = #{planEndTime}, + real_end_time = #{realEndTime}, + maint_status = #{maintStatus}, + maint_comp_rate = #{maintCompRate}, + is_flag = #{isFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where maint_instance_id = #{maintInstanceId} + + + + delete from dms_bills_maint_instance where maint_instance_id = #{maintInstanceId} + + + + delete from dms_bills_maint_instance where maint_instance_id in + + #{maintInstanceId} + + + \ No newline at end of file diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml index 5f8cd3d1..4c29ab3f 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml @@ -159,4 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from dms_fault_instance_activity where repair_instance_id=#{repairInstanceId}))) + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsFaultInstanceFileMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsFaultInstanceFileMapper.xml new file mode 100644 index 00000000..05ebd343 --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsFaultInstanceFileMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + select repair_instance_file_id, target_type, target_id, fault_file from dms_fault_instance_file + + + + + + + + insert into dms_fault_instance_file + + target_type, + target_id, + fault_file, + + + #{targetType}, + #{targetId}, + #{faultFile}, + + + + + update dms_fault_instance_file + + target_type = #{targetType}, + target_id = #{targetId}, + fault_file = #{faultFile}, + + where repair_instance_file_id = #{repairInstanceFileId} + + + + delete from dms_fault_instance_file where repair_instance_file_id = #{repairInstanceFileId} + + + + delete from dms_fault_instance_file where repair_instance_file_id in + + #{repairInstanceFileId} + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml new file mode 100644 index 00000000..883c7b09 --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select instance_activity_id, maint_instance_id, process_activity_id, maint_level, maint_group, maint_supervisor, process_handle_resolution, remark, process_handle_status, process_step_order, start_time, end_time, handle_user_id, handle_by, handle_time, create_by, create_time, transfer_user_id, attr1 from dms_maint_instance_activity + + + + + + + + insert into dms_maint_instance_activity + + maint_instance_id, + process_activity_id, + maint_level, + maint_group, + maint_supervisor, + process_handle_resolution, + remark, + process_handle_status, + process_step_order, + start_time, + end_time, + handle_user_id, + handle_by, + handle_time, + create_by, + create_time, + transfer_user_id, + attr1, + + + #{maintInstanceId}, + #{processActivityId}, + #{maintLevel}, + #{maintGroup}, + #{maintSupervisor}, + #{processHandleResolution}, + #{remark}, + #{processHandleStatus}, + #{processStepOrder}, + #{startTime}, + #{endTime}, + #{handleUserId}, + #{handleBy}, + #{handleTime}, + #{createBy}, + #{createTime}, + #{transferUserId}, + #{attr1}, + + + + + update dms_maint_instance_activity + + maint_instance_id = #{maintInstanceId}, + process_activity_id = #{processActivityId}, + maint_level = #{maintLevel}, + maint_group = #{maintGroup}, + maint_supervisor = #{maintSupervisor}, + process_handle_resolution = #{processHandleResolution}, + remark = #{remark}, + process_handle_status = #{processHandleStatus}, + process_step_order = #{processStepOrder}, + start_time = #{startTime}, + end_time = #{endTime}, + handle_user_id = #{handleUserId}, + handle_by = #{handleBy}, + handle_time = #{handleTime}, + create_by = #{createBy}, + create_time = #{createTime}, + transfer_user_id = #{transferUserId}, + attr1 = #{attr1}, + + where instance_activity_id = #{instanceActivityId} + + + + delete from dms_maint_instance_activity where instance_activity_id = #{instanceActivityId} + + + + delete from dms_maint_instance_activity where instance_activity_id in + + #{instanceActivityId} + + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml index 219ce5cc..2f371dfe 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml @@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -31,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -42,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select plan_maint_id, plan_maint_code, maint_level, maint_group, maint_supervisor, maint_time, cycle_period, maint_status, create_method, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_maint + select plan_maint_id, plan_maint_code, maint_level, maint_group, maint_supervisor, maint_time,job_id,time_limit, cycle_period, maint_status, create_method, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_maint - and print_time = #{printTime} - and print_person = #{printPerson} - and print_flag = #{printFlag} - and batch_flag = #{batchFlag} - and barcode_type = #{barcodeType} - and barcode_info = #{barcodeInfo} - and batch_code = #{batchCode} - and pallet_info_code = #{palletInfoCode} - and material_id = #{materialId} - and manufacturer_id = #{manufacturerId} - and amount = #{amount} - and machine_name like concat('%', #{machineName}, + and bbi.print_time = #{printTime} + and bbi.print_person = #{printPerson} + and bbi.print_flag = #{printFlag} + and bbi.batch_flag = #{batchFlag} + and bbi.barcode_type = #{barcodeType} + and bbi.barcode_info = #{barcodeInfo} + and bbi.batch_code = #{batchCode} + and bbi.pallet_info_code = #{palletInfoCode} + and bbi.material_id = #{materialId} + and bbi.manufacturer_id = #{manufacturerId} + and bbi.amount = #{amount} + and bbi.machine_name like concat('%', #{machineName}, '%') - and print_number = #{printNumber} - and po_no = #{poNo} - and production_date = #{productionDate} - and accepted_date = #{acceptedDate} - and last_outstock_date = #{lastOutstockDate} - and plan_code = #{planCode} - and plan_detail_code = #{planDetailCode} - and sale_order_id = #{saleOrderId} - and saleorder_code = #{saleorderCode} - and project_no = #{projectNo} - and serial_number = #{serialNumber} - and bind_status = #{bindStatus} - and bind_by = #{bindBy} - and bind_time = #{bindTime} - and update_by = #{updateBy} - and update_time = #{updateTime} + and bbi.print_number = #{printNumber} + and bbi.po_no = #{poNo} + and bbi.production_date = #{productionDate} + and bbi.accepted_date = #{acceptedDate} + and bbi.last_outstock_date = #{lastOutstockDate} + and bbi.plan_code = #{planCode} + and bbi.plan_detail_code = #{planDetailCode} + and bbi.sale_order_id = #{saleOrderId} + and bbi.saleorder_code = #{saleorderCode} + and bbi.project_no = #{projectNo} + and bbi.serial_number = #{serialNumber} + and bbi.bind_status = #{bindStatus} + and bbi.bind_by = #{bindBy} + and bbi.bind_time = #{bindTime} + and bbi.update_by = #{updateBy} + and bbi.update_time = #{updateTime} - where barcode_info = #{barcodeInfo} limit 1 + where bbi.barcode_info = #{barcodeInfo} limit 1 \ No newline at end of file diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml index 1da6bd3f..335a49c8 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml @@ -50,7 +50,7 @@ and parent_id = #{parentId} - and ancestors = #{ancestors} + and ancestors like concat('%', #{ancestors},'%') and material_id = #{materialId} and material_name like concat('%', #{materialName}, '%') diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml index 50e5e04b..60b71953 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml @@ -36,6 +36,7 @@ + @@ -47,9 +48,10 @@ mpo.project_no, mpo.material_id, mpo.material_bom_id, + concat(mb.material_name, '-', mb.material_bom_desc) material_bom_desc, mpo.dispatch_type, mpo.dispatch_id, - mbr.route_name dispatchName, + mbr.route_name dispatchName, bmi.material_code, bmi.material_name, mpo.sale_amount, @@ -73,6 +75,7 @@ from mes_product_order mpo left join mes_base_route mbr on mbr.route_id = mpo.dispatch_id left join mes_base_material_info bmi on bmi.material_id = mpo.material_id + left join mes_material_bom mb on mb.material_bom_id = mpo.material_bom_id - and product_order_id = #{productOrderId} - and plan_code = #{planCode} - and dispatch_code = #{dispatchCode} - and material_id = #{materialId} - and material_bom_id = #{materialBomId} - and process_id = #{processId} - and process_order = #{processOrder} - and last_process_id = #{lastProcessId} - and station_id = #{stationId} - and user_id = #{userId} - and production_time = #{productionTime} - and plan_amount = #{planAmount} - and complete_amount = #{completeAmount} - and plan_begin_time = #{planBeginTime} - and plan_end_time = #{planEndTime} - and real_begin_time = #{realBeginTime} - and real_end_time = #{realEndTime} - and attach_id = #{attachId} - and plan_status = #{planStatus} - and is_flag = #{isFlag} + and mpp.product_order_id = #{productOrderId} + and mpp.plan_code = #{planCode} + and mpp.dispatch_code = #{dispatchCode} + and mpp.material_id = #{materialId} + and mpp.material_bom_id = #{materialBomId} + and mpp.process_id = #{processId} + and mpp.process_order = #{processOrder} + and mpp.last_process_id = #{lastProcessId} + and mpp.station_id = #{stationId} + and mpp.user_id = #{userId} + and mpp.production_time = #{productionTime} + and mpp.plan_amount = #{planAmount} + and mpp.complete_amount = #{completeAmount} + and mpp.plan_begin_time = #{planBeginTime} + and mpp.plan_end_time = #{planEndTime} + and mpp.real_begin_time = #{realBeginTime} + and mpp.real_end_time = #{realEndTime} + and mpp.attach_id = #{attachId} + and mpp.plan_status = #{planStatus} + and mpp.is_flag = #{isFlag} @@ -258,33 +297,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into mes_product_plan_detail( plan_detail_id, plan_detail_code, plan_id, plan_code, user_id, user_name, real_begin_time, real_end_time, plan_detail_status, is_flag, remark, create_by, create_time, update_by, update_time) values - - ( #{item.planDetailId}, #{item.planDetailCode}, #{item.planId}, #{item.planCode}, #{item.userId}, #{item.userName}, #{item.realBeginTime}, #{item.realEndTime}, #{item.planDetailStatus}, #{item.isFlag}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) + insert into mes_product_plan_detail( plan_detail_id, plan_detail_code, plan_id, plan_code, user_id, user_name, + real_begin_time, real_end_time, plan_detail_status, is_flag, remark, create_by, create_time, update_by, + update_time) values + + ( #{item.planDetailId}, #{item.planDetailCode}, #{item.planId}, #{item.planCode}, #{item.userId}, + #{item.userName}, #{item.realBeginTime}, #{item.realEndTime}, #{item.planDetailStatus}, #{item.isFlag}, + #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) - - - - - - - - - - - diff --git a/hw-modules/hw-printer/pom.xml b/hw-modules/hw-printer/pom.xml index f8152bb8..c129ee68 100644 --- a/hw-modules/hw-printer/pom.xml +++ b/hw-modules/hw-printer/pom.xml @@ -41,8 +41,76 @@ spring-boot-starter-actuator - + + + com.hw + hw-api-mes + + + + org.apache.pdfbox + pdfbox + 2.0.1 + + + org.apache.pdfbox + fontbox + 2.0.0 + + + org.apache.pdfbox + jempbox + 1.8.11 + + + org.apache.pdfbox + xmpbox + 2.0.0 + + + org.apache.pdfbox + preflight + 2.0.0 + + + org.apache.pdfbox + pdfbox-tools + 2.0.0 + + + + + com.itextpdf + itextpdf + 5.5.5 + + + + com.itextpdf + itext-asian + 5.2.0 + + + + com.hw + hw-common-swagger + + + + + com.google.zxing + core + 3.5.1 + + + + com.google.zxing + javase + 3.5.1 + + + ${project.artifactId} diff --git a/hw-modules/hw-printer/src/main/java/com/hw/Main.java b/hw-modules/hw-printer/src/main/java/com/hw/Main.java deleted file mode 100644 index 0dcc1da8..00000000 --- a/hw-modules/hw-printer/src/main/java/com/hw/Main.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hw; - -// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, -// then press Enter. You can now see whitespace characters in your code. -public class Main { - public static void main(String[] args) { - // Press Alt+Enter with your caret at the highlighted text to see how - // IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - - // Press Shift+F10 or click the green arrow button in the gutter to run the code. - for (int i = 1; i <= 5; i++) { - - // Press Shift+F9 to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing Ctrl+F8. - System.out.println("i = " + i); - } - } -} \ No newline at end of file diff --git a/hw-modules/hw-printer/src/main/java/com/hw/printer/RuoYiPrinterApplication.java b/hw-modules/hw-printer/src/main/java/com/hw/printer/RuoYiPrinterApplication.java new file mode 100644 index 00000000..0e0da931 --- /dev/null +++ b/hw-modules/hw-printer/src/main/java/com/hw/printer/RuoYiPrinterApplication.java @@ -0,0 +1,31 @@ +package com.hw.printer; + +import com.hw.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +/** + * 文件服务 + * + * @author ruoyi + */ +@EnableCustomSwagger2 +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) +public class RuoYiPrinterApplication +{ + public static void main(String[] args) + { + SpringApplication.run(RuoYiPrinterApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/hw-modules/hw-printer/src/main/java/com/hw/printer/controller/PrinterController.java b/hw-modules/hw-printer/src/main/java/com/hw/printer/controller/PrinterController.java new file mode 100644 index 00000000..24230840 --- /dev/null +++ b/hw-modules/hw-printer/src/main/java/com/hw/printer/controller/PrinterController.java @@ -0,0 +1,42 @@ +package com.hw.printer.controller; + +import com.hw.common.core.domain.R; +import com.hw.mes.api.domain.MesBaseBarcodeInfo; +import com.hw.printer.service.IPrinterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 打印机请求处理 + * + * @author Yinq + */ +@RestController +@RequestMapping("/printService") +public class PrinterController { + private static final Logger log = LoggerFactory.getLogger(PrinterController.class); + + @Autowired + private IPrinterService printerService; + + /** + * 打印条码接口 + * @param barcodeInfo + * @return + */ + @PostMapping("/printBarCode") + public R printBarCode(@RequestBody MesBaseBarcodeInfo barcodeInfo) { + try { + return R.ok(printerService.printBarCode(barcodeInfo)); + } catch (Exception e) { + log.error("打印条码失败", e); + return R.fail(e.getMessage()); + } + } + +} \ No newline at end of file diff --git a/hw-modules/hw-printer/src/main/java/com/hw/printer/service/IPrinterService.java b/hw-modules/hw-printer/src/main/java/com/hw/printer/service/IPrinterService.java new file mode 100644 index 00000000..4c242b05 --- /dev/null +++ b/hw-modules/hw-printer/src/main/java/com/hw/printer/service/IPrinterService.java @@ -0,0 +1,19 @@ +package com.hw.printer.service; + +import com.hw.mes.api.domain.MesBaseBarcodeInfo; + +/** + * 打印机服务接口 + * + * @author Yinq + */ +public interface IPrinterService { + + /** + * 打印条码接口 + * @param barcodeInfo + * @return + * @throws Exception + */ + MesBaseBarcodeInfo printBarCode(MesBaseBarcodeInfo barcodeInfo) throws Exception; +} diff --git a/hw-modules/hw-printer/src/main/java/com/hw/printer/service/PrinterServiceImpl.java b/hw-modules/hw-printer/src/main/java/com/hw/printer/service/PrinterServiceImpl.java new file mode 100644 index 00000000..c63d22cc --- /dev/null +++ b/hw-modules/hw-printer/src/main/java/com/hw/printer/service/PrinterServiceImpl.java @@ -0,0 +1,61 @@ +package com.hw.printer.service; + +import com.hw.common.core.utils.DateUtils; +import com.hw.common.core.utils.StringUtils; +import com.hw.mes.api.domain.MesBaseBarcodeInfo; +import com.hw.printer.utils.HwPrintUtil; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Value; + +import java.util.HashMap; + +/** + * 打印机服务Service + * + * @author Yinq + */ +@Service +public class PrinterServiceImpl implements IPrinterService { + + /** + * 打印机映射路径 + */ + @Value("${print.path}") + public String localPrintPath; + + /** + * PDF模板路径 + */ + @Value("${print.pdfTemplatePath}") + public String pdfTemplatePath; + + /** + * 生成PDF文件路径 + */ + @Value("${print.generatePath}") + public String generatePath; + + /** + * 打印条码接口 + * + * @param barcodeInfo + * @return + * @throws Exception + */ + @Override + public MesBaseBarcodeInfo printBarCode(MesBaseBarcodeInfo barcodeInfo) throws Exception { + HashMap params = new HashMap<>(); + params.put("localPrintPath", localPrintPath); + params.put("pdfTemplatePath", pdfTemplatePath); + params.put("generatePath", generatePath); + params.put("barcodeInfo", barcodeInfo.getBarcodeInfo()); + params.put("batchCode", barcodeInfo.getBatchCode()); + params.put("materialName", barcodeInfo.getMaterialName()); + params.put("date", DateUtils.getDate()); + String machineName = HwPrintUtil.printBarCode(params); + barcodeInfo.setMachineName(machineName); + return barcodeInfo; + } + + +} diff --git a/hw-modules/hw-printer/src/main/java/com/hw/printer/utils/HwPrintUtil.java b/hw-modules/hw-printer/src/main/java/com/hw/printer/utils/HwPrintUtil.java new file mode 100644 index 00000000..308ae63b --- /dev/null +++ b/hw-modules/hw-printer/src/main/java/com/hw/printer/utils/HwPrintUtil.java @@ -0,0 +1,281 @@ +package com.hw.printer.utils; + +import com.hw.common.core.exception.ServiceException; +import com.itextpdf.text.Document; +import com.itextpdf.text.Image; +import com.itextpdf.text.pdf.*; +import org.apache.pdfbox.pdmodel.PDDocument; + +import org.apache.pdfbox.printing.PDFPrintable; +import org.apache.pdfbox.printing.Scaling; + +import javax.annotation.PostConstruct; +import javax.print.*; + +import java.awt.print.*; +import java.io.*; +import java.util.HashMap; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + + +/** + * @author wanghao + * @date 2022/4/24 14:52 + */ +@Component +public class HwPrintUtil { + + private static final Logger log = LoggerFactory.getLogger(HwPrintUtil.class); + + /** + * 打印机映射路径 + */ + public static String localPrintPath; + + /** + * PDF模板路径 + */ + public static String pdfTemplatePath; + + /** + * 生成PDF文件路径 + */ + public static String generatePath; + + /** + * 打印机List + */ + private static PrintService[] printServices; + + /** + * 打印机服务 + */ + private static PrintService printService = null; + + /** + * 项目启动时，初始化打印机参数 + */ + @PostConstruct + public static void findPrinters() { + printServices = PrintServiceLookup.lookupPrintServices(null, null); + System.out.println("Bean已初始化，执行@PostConstruct注解的方法"); + } + + /** + * 打印方法 + * + * @param params + * @return + */ + public static String printBarCode(HashMap params) { + //解析参数生成打印图片 + localPrintPath = params.get("localPrintPath"); + pdfTemplatePath = params.get("pdfTemplatePath"); + generatePath = params.get("generatePath"); + String barcodeInfo = params.get("barcodeInfo"); + String batchCode = params.get("batchCode"); + String materialName = params.get("materialName"); + String date = params.get("date"); + initPrintService(); + File outputFile = printQRCode(barcodeInfo, batchCode, materialName, date); + try { + printPdf(outputFile); + log.info("打印条码printBarCode方法,条码内容：" + barcodeInfo); + return localPrintPath; + } catch (Exception e) { + log.error("打印条码printPdf异常：" + e); + throw new ServiceException("打印条码printPdf异常：" + e); + } + } + + /** + * 打印二维码到PDF文件 + * + * @param barcodeInfo 条形码信息 + * @param batchCode 批次代码 + * @param materialName 物料名称 + * @param date 日期 + * @return 生成的PDF文件 + */ + public static File printQRCode(String barcodeInfo, String batchCode, String materialName, String date) { + try { + // 生成PDF文件 + File generateFile = new File(generatePath); + FileOutputStream out = new FileOutputStream(generateFile); + // 打印模板PDF + PdfReader reader = new PdfReader(pdfTemplatePath); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + // 修改PDF文档的PdfStamper实例，将修改后的内容输出到内存中的字节数组 + PdfStamper stamper = new PdfStamper(reader, bos); + // 动态地将变量的值填充到PDF表单相应字段 + AcroFields form = stamper.getAcroFields(); + form.setField("code", barcodeInfo); + form.setField("name", materialName); + form.setField("spe", batchCode); + form.setField("data", date); + //获取位置(左上右下) + AcroFields.FieldPosition fieldPosition = form.getFieldPositions("qrcode").get(0); + // 绘制二维码 + float width = fieldPosition.position.getRight() - fieldPosition.position.getLeft(); + BarcodeQRCode pdf417 = new BarcodeQRCode(barcodeInfo, (int) width, (int) width, null); + // 生成二维码图像 + Image image128 = pdf417.getImage(); + // 条码位置 + image128.setAbsolutePosition(fieldPosition.position.getLeft(), fieldPosition.position.getBottom()); + // 获取PDF的第一页 + PdfContentByte cb = stamper.getOverContent(1); + cb.addImage(image128); + // 设置表单不可编辑（即将表单字段内容固定到PDF中） + stamper.setFormFlattening(true); + // 关闭PdfStamper + stamper.close(); + // 创建一个新的文档对象 + Document doc = new Document(); + // 创建 PdfCopy 对象，关联到输出流 + PdfCopy copy = new PdfCopy(doc, out); + // 打开文档 + doc.open(); + // 从内存中的字节数组创建一个 PdfImportedPage 对象 + PdfImportedPage importPage = copy.getImportedPage(new PdfReader(bos.toByteArray()), 1); + // 将导入的页面添加到新文档中 + copy.addPage(importPage); + // 关闭文档 + doc.close(); + return generateFile; + } catch (Exception e) { + log.error("打印条码生成PDF异常：" + e); + } + return null; + } + + /** + * 打印条形码到PDF文件 + * + * @param barcodeInfo 条形码信息 + * @param batchCode 批次代码 + * @param materialName 物料名称 + * @param date 日期 + * @return 生成的PDF文件 + */ + public static File printBarCode(String barcodeInfo, String batchCode, String materialName, String date) { + try { + // 生成PDF文件 + File generateFile = new File(generatePath); + FileOutputStream out = new FileOutputStream(generateFile); + // 加载PDF模板 + PdfReader reader = new PdfReader(pdfTemplatePath); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + // 创建PdfStamper以修改PDF并将输出到字节数组 + PdfStamper stamper = new PdfStamper(reader, bos); + // 动态填充表单字段 + AcroFields form = stamper.getAcroFields(); + form.setField("code", barcodeInfo); + form.setField("name", materialName); + form.setField("spe", batchCode); + form.setField("data", date); + // 获取条形码字段的位置 + AcroFields.FieldPosition fieldPosition = form.getFieldPositions("qrcode").get(0); + // 绘制条形码 + float width = fieldPosition.position.getRight() - fieldPosition.position.getLeft(); + Barcode39 barcode39 = new Barcode39(); + barcode39.setCode(barcodeInfo); + barcode39.setBarHeight(50f); // 根据需要调整条形码大小 + Image barcodeImage = barcode39.createImageWithBarcode(stamper.getOverContent(1), null, null); + barcodeImage.setAbsolutePosition(fieldPosition.position.getLeft(), fieldPosition.position.getBottom()); + // 将条形码图像添加到第一页 + stamper.getOverContent(1).addImage(barcodeImage); + // 将表单平铺（使其不可编辑） + stamper.setFormFlattening(true); + // 关闭PdfStamper + stamper.close(); + // 创建新文档 + Document doc = new Document(); + // 创建关联到输出流的PdfCopy对象 + PdfCopy copy = new PdfCopy(doc, out); + // 打开文档 + doc.open(); + // 从字节数组创建一个PdfImportedPage对象 + PdfImportedPage importPage = copy.getImportedPage(new PdfReader(bos.toByteArray()), 1); + // 将导入的页面添加到新文档中 + copy.addPage(importPage); + // 关闭文档 + doc.close(); + return generateFile; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + /** + * 打印PDF + * + * @param pdfFile 要打印的PDF文件 + * @throws IOException 如果PDF加载或打印失败 + */ + private static void printPdf(File pdfFile) throws IOException { + PDDocument document = null; + try { + document = PDDocument.load(pdfFile); + //打印的页面的大小和方向 + PageFormat pageFormat = new PageFormat(); + //设置打印方向 PORTRAIT 竖向 REVERSE_LANDSCAPE 横向 + pageFormat.setOrientation(PageFormat.PORTRAIT); + Paper paper = new Paper(); + // 纸的大小 + paper.setSize(221, 200); + // Print 区域 + paper.setImageableArea(2, -15, 221, 200); + pageFormat.setPaper(paper); + Book book = new Book(); + PDFPrintable printable = new PDFPrintable(document, Scaling.SCALE_TO_FIT); + book.append(printable, pageFormat, document.getNumberOfPages()); + PrinterJob job = PrinterJob.getPrinterJob(); + job.setPrintService(printService); + job.setPageable(book); + job.defaultPage(); + try { + job.print(); + } catch (PrinterException e) { + throw new IOException("PDF打印失败:", e); + } + } catch (PrinterException e) { + throw new ServiceException("打印机服务错误:" + e); + } finally { + if (document != null) { + try { + document.close(); + } catch (IOException e) { + // 处理关闭文档时可能出现的异常 + e.printStackTrace(); + } + } + } + } + + /** + * 导出为金山PDF + * 导出为WPS PDF + * 发送至 OneNote 2013 + * Microsoft XPS Document Writer + * Microsoft Print to PDF + * Fax + * \\10.11.43.159\HP LaserJet MFP M129-M134 + * \\10.11.43.159\HP Laser NS 1020 + */ + public static void initPrintService() { + for (PrintService service : printServices) { + System.out.println(service.getName()); + if (service.getName().contains(localPrintPath)) { + printService = service; + break; + } + } + if (printService == null) { + throw new ServiceException("打印机配置错误!"); + } + } +} diff --git a/hw-modules/hw-printer/src/main/resources/banner.txt b/hw-modules/hw-printer/src/main/resources/banner.txt index fbd45f53..8eeae464 100644 --- a/hw-modules/hw-printer/src/main/resources/banner.txt +++ b/hw-modules/hw-printer/src/main/resources/banner.txt @@ -1,10 +1,6 @@ Spring Boot Version: ${spring-boot.version} Spring Application Name: ${spring.application.name} - _ _ - (_) | | - _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ -| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ -| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | -|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| - __/ | __/ | - |___/ |___/ \ No newline at end of file + / __ ___ __ ( ) __ __ ___ ___ __ + // ) ) // / / / / ____ // ) ) // ) ) / / // ) ) / / //___) ) // ) ) + // / / // / / / / //___/ / // / / // / / / / // // +// / / ((__( (__/ / // // / / // / / / / ((____ // \ No newline at end of file diff --git a/hw-modules/hw-printer/src/main/resources/files/Template.pdf b/hw-modules/hw-printer/src/main/resources/files/Template.pdf new file mode 100644 index 00000000..fad1ab7e Binary files /dev/null and b/hw-modules/hw-printer/src/main/resources/files/Template.pdf differ diff --git a/hw-modules/hw-printer/src/main/resources/files/generatefile.pdf b/hw-modules/hw-printer/src/main/resources/files/generatefile.pdf new file mode 100644 index 00000000..3ef6512c Binary files /dev/null and b/hw-modules/hw-printer/src/main/resources/files/generatefile.pdf differ diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/common/controller/WfProcessActivityController.java b/hw-modules/hw-system/src/main/java/com/hw/system/common/controller/WfProcessActivityController.java index 60db74d0..41e11cbc 100644 --- a/hw-modules/hw-system/src/main/java/com/hw/system/common/controller/WfProcessActivityController.java +++ b/hw-modules/hw-system/src/main/java/com/hw/system/common/controller/WfProcessActivityController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.hw.system.api.domain.common.WfProcessActivity; +import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -102,4 +103,12 @@ public class WfProcessActivityController extends BaseController { return toAjax(wfProcessActivityService.deleteWfProcessActivityByProcessActivityIds(processActivityIds)); } + /** + * 通过wfid查询第一步的主键id + * */ + @PostMapping("/selectProcessActivityIdByWfProcessId") + public Long selectProcessActivityIdByWfProcessId(@RequestBody Long wfProcessId){ + return wfProcessActivityService.selectProcessActivityIdByWfProcessId(wfProcessId); +// return 200l; + } } diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/common/mapper/WfProcessActivityMapper.java b/hw-modules/hw-system/src/main/java/com/hw/system/common/mapper/WfProcessActivityMapper.java index f2dc78cf..f6f8cdfa 100644 --- a/hw-modules/hw-system/src/main/java/com/hw/system/common/mapper/WfProcessActivityMapper.java +++ b/hw-modules/hw-system/src/main/java/com/hw/system/common/mapper/WfProcessActivityMapper.java @@ -85,4 +85,7 @@ public interface WfProcessActivityMapper * @return 结果 */ public int deleteWfProcessActivityAuthByProcessActivityId(Long processActivityId); + + Long selectProcessActivityIdByWfProcessId(Long wfProcessId); + } diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/common/service/IWfProcessActivityService.java b/hw-modules/hw-system/src/main/java/com/hw/system/common/service/IWfProcessActivityService.java index 303e8d77..1deb45d3 100644 --- a/hw-modules/hw-system/src/main/java/com/hw/system/common/service/IWfProcessActivityService.java +++ b/hw-modules/hw-system/src/main/java/com/hw/system/common/service/IWfProcessActivityService.java @@ -59,4 +59,6 @@ public interface IWfProcessActivityService * @return 结果 */ public int deleteWfProcessActivityByProcessActivityId(Long processActivityId); + + Long selectProcessActivityIdByWfProcessId(Long wfProcessId); } diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/WfProcessActivityServiceImpl.java b/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/WfProcessActivityServiceImpl.java index e32bb3d7..c572d6d7 100644 --- a/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/WfProcessActivityServiceImpl.java +++ b/hw-modules/hw-system/src/main/java/com/hw/system/common/service/impl/WfProcessActivityServiceImpl.java @@ -138,6 +138,11 @@ public class WfProcessActivityServiceImpl implements IWfProcessActivityService return wfProcessActivityMapper.deleteWfProcessActivityByProcessActivityId(processActivityId); } + @Override + public Long selectProcessActivityIdByWfProcessId(Long wfProcessId) { + return wfProcessActivityMapper.selectProcessActivityIdByWfProcessId(wfProcessId); + } + /** * 新增工单流程节点步骤权限信息 * diff --git a/hw-modules/hw-system/src/main/resources/mapper/system/common/WfProcessActivityMapper.xml b/hw-modules/hw-system/src/main/resources/mapper/system/common/WfProcessActivityMapper.xml index d12ae89b..ab57f3c0 100644 --- a/hw-modules/hw-system/src/main/resources/mapper/system/common/WfProcessActivityMapper.xml +++ b/hw-modules/hw-system/src/main/resources/mapper/system/common/WfProcessActivityMapper.xml @@ -160,4 +160,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( #{item.processActivityAuthId}, #{item.processActivityId}, #{item.authTargetType}, #{item.authTargetId}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) + + diff --git a/hw-ui/src/api/dms/dmsBillsMaintInstance.js b/hw-ui/src/api/dms/dmsBillsMaintInstance.js new file mode 100644 index 00000000..18d5ea0b --- /dev/null +++ b/hw-ui/src/api/dms/dmsBillsMaintInstance.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询保养工单列表 +export function listDmsBillsMaintInstance(query) { + return request({ + url: '/dms/dmsBillsMaintInstance/list', + method: 'get', + params: query + }) +} + +// 查询保养工单详细 +export function getDmsBillsMaintInstance(maintInstanceId) { + return request({ + url: '/dms/dmsBillsMaintInstance/' + maintInstanceId, + method: 'get' + }) +} + +// 新增保养工单 +export function addDmsBillsMaintInstance(data) { + return request({ + url: '/dms/dmsBillsMaintInstance', + method: 'post', + data: data + }) +} + +// 修改保养工单 +export function updateDmsBillsMaintInstance(data) { + return request({ + url: '/dms/dmsBillsMaintInstance', + method: 'put', + data: data + }) +} + +// 删除保养工单 +export function delDmsBillsMaintInstance(maintInstanceId) { + return request({ + url: '/dms/dmsBillsMaintInstance/' + maintInstanceId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/dms/dmsMaintInstanceActivity.js b/hw-ui/src/api/dms/dmsMaintInstanceActivity.js new file mode 100644 index 00000000..8f8a8266 --- /dev/null +++ b/hw-ui/src/api/dms/dmsMaintInstanceActivity.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 查询保养工单实例节点列表 +export function listDmsMaintInstanceActivity(query) { + return request({ + url: '/dms/dmsMaintInstanceActivity/list', + method: 'get', + params: query + }) +} + +// 查询保养工单实例节点详细 +export function getDmsMaintInstanceActivity(instanceActivityId) { + return request({ + url: '/dms/dmsMaintInstanceActivity/' + instanceActivityId, + method: 'get' + }) +} + +// 新增保养工单实例节点 +export function addDmsMaintInstanceActivity(data) { + return request({ + url: '/dms/dmsMaintInstanceActivity', + method: 'post', + data: data + }) +} + +// 修改保养工单实例节点 +export function updateDmsMaintInstanceActivity(data) { + return request({ + url: '/dms/dmsMaintInstanceActivity', + method: 'put', + data: data + }) +} + +// 删除保养工单实例节点 +export function delDmsMaintInstanceActivity(instanceActivityId) { + return request({ + url: '/dms/dmsMaintInstanceActivity/' + instanceActivityId, + method: 'delete' + }) +} + +export function selectUserIdByDmsMaintInstanceActivityId(maintInstanceId,userId) { + return request({ + url:`/dms/dmsMaintInstanceActivity/selectUserIdByDmsMaintInstanceActivityId/${maintInstanceId}/userId/${userId}`, + method:'get' + }) +} diff --git a/hw-ui/src/api/mes/barcode.js b/hw-ui/src/api/mes/barcode.js index a3ed1980..6d990e97 100644 --- a/hw-ui/src/api/mes/barcode.js +++ b/hw-ui/src/api/mes/barcode.js @@ -42,3 +42,11 @@ export function delBarcode(barcodeId) { method: 'delete' }) } + +// 打印条码 +export function printBarCode(barcodeId) { + return request({ + url: '/mes/barcode/printBarCode/' + barcodeId, + method: 'get' + }) +} diff --git a/hw-ui/src/api/mes/productOrder.js b/hw-ui/src/api/mes/productOrder.js index 62bfa7ff..e372de11 100644 --- a/hw-ui/src/api/mes/productOrder.js +++ b/hw-ui/src/api/mes/productOrder.js @@ -64,7 +64,7 @@ export function productOrderPublish(data) { //撤回 export function productOrderRecall(data) { return request({ - url: '/mes/productOrder/productOrderRecall', + url: '/mes/productplan/productOrderRecall', method: 'post', data: data }) @@ -77,3 +77,11 @@ export function delProductOrder(productOrderId) { method: 'delete' }) } + +// 校验BOM是否被生产工单选择 +export function verifyBOMIsProduction(materialBomId) { + return request({ + url: '/mes/productOrder/verifyBOMIsProduction/' + materialBomId, + method: 'get' + }) +} diff --git a/hw-ui/src/components/Crontab/result.vue b/hw-ui/src/components/Crontab/result.vue index aea6e0e4..b2f1c1ab 100644 --- a/hw-ui/src/components/Crontab/result.vue +++ b/hw-ui/src/components/Crontab/result.vue @@ -334,6 +334,7 @@ export default { this.resultList.push('最近100年内只有上面' + resultArr.length + '条结果！') } } + // 计算完成-显示结果 this.isShow = true; diff --git a/hw-ui/src/router/index.js b/hw-ui/src/router/index.js index dd86679a..1737f037 100644 --- a/hw-ui/src/router/index.js +++ b/hw-ui/src/router/index.js @@ -264,7 +264,7 @@ export const dynamicRoutes = [ path: "index/:repairInstanceId(\\d+)", component: () => import("@/views/dms/repairInstanceActivity/index"), name: "childInstanceUpdate", - meta: { title: "工单审批", activeMenu: "/repairInstanceActivity" }, + meta: { title: "工单处理", activeMenu: "/repairInstanceActivity" }, }, ], }, @@ -323,7 +323,7 @@ export const dynamicRoutes = [ path: "index/:inspectInstanceId(\\d+)", component: () => import("@/views/dms/dmsBillsInspectActivity/index"), name: "childDmsBillsInspectActivity", - meta: { title: "工单审批", activeMenu: "/dmsBillsInspectActivity" }, + meta: { title: "工单处理", activeMenu: "/dmsBillsInspectActivity" }, }, ], }, @@ -339,7 +339,7 @@ export const dynamicRoutes = [ path: "index/:inspectInstanceId(\\d+)", component: () => import("@/views/dms/dmsBillsInspectActivity/index"), name: "selectDmsBillsInspectActivity", - meta: { title: "工单审批", activeMenu: "/dmsBillsInspectActivity" }, + meta: { title: "工单处理", activeMenu: "/dmsBillsInspectActivity" }, }, ], }, @@ -354,7 +354,7 @@ export const dynamicRoutes = [ path: "index/:lubeInstanceId(\\d+)", component: () => import("@/views/dms/dmsBillsLubeInstanceActivity/index"), name: "childDmsBillsLubeInstanceActivity", - meta: { title: "工单审批", activeMenu: "/dmsBillsLubeInstanceActivity" }, + meta: { title: "工单处理", activeMenu: "/dmsBillsLubeInstanceActivity" }, }, ], }, @@ -369,7 +369,7 @@ export const dynamicRoutes = [ path: "index/:lubeInstanceId(\\d+)", component: () => import("@/views/dms/dmsBillsLubeInstanceActivity/index"), name: "selectChildDmsBillsLubeInstanceActivity", - meta: { title: "工单审批", activeMenu: "/dmsBillsLubeInstanceActivity" }, + meta: { title: "工单处理", activeMenu: "/dmsBillsLubeInstanceActivity" }, }, ], }, @@ -384,7 +384,22 @@ export const dynamicRoutes = [ path: "index/:repairInstanceId(\\d+)", component: () => import("@/views/dms/activity/index"), name: "childDmsFaultInstanceActivity", - meta: { title: "工单审批", activeMenu: "/activity" }, + meta: { title: "工单处理", activeMenu: "/activity" }, + }, + ], + }, + //审批保养工单路由 + { + path: "/dms/dmsMaintInstanceActivity", + component: Layout, + hidden: true, + permissions: ["tool:gen:edit"], + children: [ + { + path: "index/:maintInstanceId(\\d+)", + component: () => import("@/views/dms/dmsMaintInstanceActivity/index"), + name: "childDmsMaintInstanceActivity", + meta: { title: "工单处理", activeMenu: "/dmsMaintInstanceActivity" }, }, ], }, diff --git a/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue b/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue index 07e39b90..9913d5ed 100644 --- a/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue +++ b/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue @@ -1,78 +1,18 @@ - + + + + @@ -319,11 +348,16 @@ import { listMaint, getMaint, delMaint, addMaint, updateMaint } from "@/api/dms/ import { listLedger } from '@/api/dms/ledger' import { listStation } from '@/api/dms/station' import { listStandard } from '@/api/dms/standard' +import Crontab from '@/components/Crontab/index' export default { + components: { Crontab }, name: "Maint", dicts:['dms_maint_level','dms_create_method','dms_maint_status'], data() { return { + // 传入的表达式 + expression: "", + openCron:false, // 遮罩层 loading: true, // 选中数组 @@ -387,6 +421,16 @@ export default { this.getStandard(); }, methods: { + /** cron表达式按钮操作 */ + handleShowCron() { + this.expression = this.form.cronExpression; + this.openCron = true; + }, + /** 确定后回传值 */ + crontabFill(value) { + this.form.cronExpression = value; + + }, //跳转 jumpToDetail(row){ this.$router.push('/dms/maintDetail/index/' + row.planMaintId) diff --git a/hw-ui/src/views/mes/barcode/index.vue b/hw-ui/src/views/mes/barcode/index.vue index 15ab81f5..88b2c68a 100644 --- a/hw-ui/src/views/mes/barcode/index.vue +++ b/hw-ui/src/views/mes/barcode/index.vue @@ -11,16 +11,16 @@ /> - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + 搜索 重置 @@ -70,19 +46,21 @@ size="mini" @click="handleAdd" v-hasPermi="['mes:barcode:add']" - >新增 - - - 修改 + >新增 + + + + + + + + + + + + + 删除 + >删除 + 导出 + >导出 + - + - - - - - - - - + - - - - + + + + + + + - - - + + + + + + + @@ -157,12 +137,12 @@ - + - + - + @@ -205,55 +194,51 @@ - - - - - - - - - - - + + + + + {{dict.label}} + :disabled="batchVisible" + >{{ dict.label }} + - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + - - - + + + - + @@ -264,14 +249,14 @@ placeholder="请选择生产日期"> - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
确 定 取 消
+ + + + +
+ 确 定 + 取 消 +
+ +