xins
/
HwJyHbMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	hw-ui/src/views/board/fifthFloor/index.vue
master
夜笙歌 1 year ago
parent 1021187f1b 30fda09bf4
commit 81d8ecab14
140 changed files with 4039 additions and 624 deletions
Show Stats Download Patch File Download Diff File

11
hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java
Unescape Escape View File

@ -48,4 +48,15 @@ public interface RemoteMesService {
public R<List<MesBaseStationInfo>> getStations(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 通过绑定条码查询条码信息
*
* @param bindBarcode 绑定条码信息
* @param source 请求来源
* @return 结果
*/
@GetMapping("/barcode/getBarcodeByBindBarcode/{bindBarcode}")
public R<MesBaseBarcodeInfo> getBarcodeByBindBarcode(@PathVariable("bindBarcode") String bindBarcode, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}

5
hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java
Unescape Escape View File

@ -40,6 +40,11 @@ public class RemoteMesFallbackFactory implements FallbackFactory<RemoteMesServic
public R<List<MesBaseStationInfo>> getStations(String source) {
return R.fail("获取工位列表信息失败:" + throwable.getMessage());
}
@Override
public R<MesBaseBarcodeInfo> getBarcodeByBindBarcode(String bindBarcode, String source) {
return R.fail("获取绑定条码信息失败:" + throwable.getMessage());
}
};
}
}

6
hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/DmsConstants.java
Unescape Escape View File

@ -71,4 +71,10 @@ public class DmsConstants {
public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING="2";//润滑中
public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE="3";//润滑完成
/** 附件信息附件类别*/
public static final String MES_BASE_ATTACH_INFO_KNOWLEDGELUBE="3";//润滑知识库
public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT="4";//保养知识库
public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR="5";//设备知识库
}

9
hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java
Unescape Escape View File

@ -78,4 +78,13 @@ public class MesConstants {
/**校验类型(0不校验,1人工校验,2自动校验)*/
public static final String MES_MATERIAL_BOM_CHECK_TYPE_MANUAL = "1";//人工校验
/**条码信息绑定状态*/
public static final String MES_BARCODE_BIND_STATUS_BINDING= "1";//绑定
public static final String MES_ASSIGN_TASK_KEY = "fifth_floor_assign_task";//五楼分配柜体任务到具体工位的key
public static final String MES_ASSIGN_TASK_RESULT_KEY = "fifth_floor_assign_task_result";//五楼分配柜体任务到具体工位返库key
}

2
hw-common/hw-common-core/src/main/java/com/hw/common/core/web/controller/BaseController.java
Unescape Escape View File

@ -151,4 +151,6 @@ public class BaseController
return rspData;
}
}

5
hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java
Unescape Escape View File

@ -119,4 +119,9 @@ public enum BusinessType
*/
INSTOCK,
/**
* 绑定
*/
BIND,
}

3
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java
Unescape Escape View File

@ -105,6 +105,7 @@ public class DmsBillsInspectInstanceActivityController extends BaseController
@GetMapping("/selectUserIdByDmsBillsInspectInstanceActivityId/{lubeInstanceId}/userId/{userId}")
public boolean selectUserIdByDmsBillsInspectInstanceActivityId(@PathVariable("lubeInstanceId") Long lubeInstanceId,@PathVariable("userId") Long userId){
return dmsBillsInspectInstanceActivityService.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId,userId);
boolean b = dmsBillsInspectInstanceActivityService.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId, userId);
return b;
}
}

112
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectInstanceDetailProjectController.java
Unescape Escape View File

@ -0,0 +1,112 @@
package com.hw.dms.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.apache.poi.ss.formula.functions.T;
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.DmsInspectInstanceDetailProject;
import com.hw.dms.service.IDmsInspectInstanceDetailProjectService;
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 xins
* @date 2024-04-10
*/
@RestController
@RequestMapping("/inspectinstancedetailproject")
public class DmsInspectInstanceDetailProjectController extends BaseController
{
@Autowired
private IDmsInspectInstanceDetailProjectService dmsInspectInstanceDetailProjectService;
/**
* 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表
*/
@RequiresPermissions("dms:inspectinstancedetailproject:list")
@GetMapping("/list")
public TableDataInfo list(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
startPage();
List<DmsInspectInstanceDetailProject> list = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject);
return getDataTable(list);
}
@GetMapping("/selectDmsInspectInstanceDetailProjectByInspectInstanceId/{inspectInstanceId}/{lineStep}")
public TableDataInfo selectDmsInspectInstanceDetailProjectByInspectInstanceId(@PathVariable("inspectInstanceId") Long inspectInstanceId,@PathVariable("lineStep") Long lineStep){
List<DmsInspectInstanceDetailProject> dmsInspectInstanceDetailProjects = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectByInspectInstanceId(inspectInstanceId, lineStep);
return getDataTable(dmsInspectInstanceDetailProjects);
}
/**
* 导出点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表
*/
@RequiresPermissions("dms:inspectinstancedetailproject:export")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
List<DmsInspectInstanceDetailProject> list = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject);
ExcelUtil<DmsInspectInstanceDetailProject> util = new ExcelUtil<DmsInspectInstanceDetailProject>(DmsInspectInstanceDetailProject.class);
util.exportExcel(response, list, "点巡检工单明细项目信息;质检检查每个项目的质检结果详情数据");
}
/**
* 获取点巡检工单明细项目信息;质检检查每个项目的质检结果详情详细信息
*/
@RequiresPermissions("dms:inspectinstancedetailproject:query")
@GetMapping(value = "/{instanceDetailProjectId}")
public AjaxResult getInfo(@PathVariable("instanceDetailProjectId") Long instanceDetailProjectId)
{
return success(dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId));
}
/**
* 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*/
@RequiresPermissions("dms:inspectinstancedetailproject:add")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
return toAjax(dmsInspectInstanceDetailProjectService.insertDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject));
}
/**
* 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*/
@RequiresPermissions("dms:inspectinstancedetailproject:edit")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
return toAjax(dmsInspectInstanceDetailProjectService.updateDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject));
}
/**
* 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*/
@RequiresPermissions("dms:inspectinstancedetailproject:remove")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{instanceDetailProjectIds}")
public AjaxResult remove(@PathVariable Long[] instanceDetailProjectIds)
{
return toAjax(dmsInspectInstanceDetailProjectService.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(instanceDetailProjectIds));
}
}

10
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectRouteDetailController.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.hw.dms.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -24,7 +26,7 @@ import com.hw.common.core.web.page.TableDataInfo;
/**
* 巡检线路明细Controller
*
*
* @author Open Platform
* @date 2024-01-16
*/
@ -47,6 +49,12 @@ public class DmsInspectRouteDetailController extends BaseController
return getDataTable(list);
}
/** 通过线路id查询线路明细列表*/
@GetMapping("/selectInspectRouteListByInspectRouteId/{inspectRouteId}")
public TableDataInfo selectInspectRouteListByInspectRouteId(@PathVariable("inspectRouteId") Long inspectRouteId){
List<DmsInspectRouteDetail> dmsInspectRouteDetails = dmsInspectRouteDetailService.selectInspectRouteListByInspectRouteId(inspectRouteId);
return getDataTable(dmsInspectRouteDetails);
}
/**
* 导出巡检线路明细列表
*/

11
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeDetailController.java
Unescape Escape View File

@ -85,6 +85,15 @@ public class DmsPlanLubeDetailController extends BaseController
{
return success(dmsPlanLubeDetailService.selectDmsPlanLubeDetailByPlanLubeDetailId(planLubeDetailId));
}
/**
* 根据计划id查询明细
* */
@GetMapping("/getDmsPlanDetailByPlanLubeId/{planLubeId}")
public TableDataInfo selectPlanLubeDetailByPlanLubeId(@PathVariable("planLubeId") Long planLubeId){
List<DmsPlanLubeDetail> dmsPlanLubeDetails = dmsPlanLubeDetailService.selectPlanLubeDetailByPlanLubeId(planLubeId);
return getDataTable(dmsPlanLubeDetails);
}
/**
* 新增润滑计划明细
@ -156,4 +165,6 @@ public class DmsPlanLubeDetailController extends BaseController
return success(dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger));
}
}

8
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintDetailController.java
Unescape Escape View File

@ -69,6 +69,14 @@ public class DmsPlanMaintDetailController extends BaseController
{
return success(dmsPlanMaintDetailService.selectDmsPlanMaintDetailByPlanMaintDetailId(planMaintDetailId));
}
/**
* 根据计划id获取保养计划明细列表
* */
@GetMapping("/getDmsPlanMaintDetail/{planMaintId}")
public TableDataInfo getDmsPlanMaintDetail(@PathVariable("planMaintId") Long planMaintId){
List<DmsPlanMaintDetail> dmsPlanMaintDetails = dmsPlanMaintDetailService.selectDmsPlanMaintDetailListByPlanMaintId(planMaintId);
return getDataTable(dmsPlanMaintDetails);
}
/**
* 新增保养计划明细

10
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairDetailController.java
Unescape Escape View File

@ -24,7 +24,7 @@ import com.hw.common.core.web.page.TableDataInfo;
/**
* 检修计划明细Controller
*
*
* @author Open Platform
* @date 2024-01-15
*/
@ -47,6 +47,14 @@ public class DmsPlanRepairDetailController extends BaseController
return getDataTable(list);
}
/** 根据计划id查询计划明细列表*/
@GetMapping("/selectPlanRepairDetailByPlanRepairId/{planRepairId}")
public TableDataInfo selectPlanRepairDetailByPlanRepairId(@PathVariable("planRepairId") Long planRepairId){
List<DmsPlanRepairDetail> dmsPlanRepairDetails = dmsPlanRepairDetailService.selectPlanRepairDetailByPlanRepairId(planRepairId);
return getDataTable(dmsPlanRepairDetails);
}
/**
* 导出检修计划明细列表
*/

163
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/BaseAttachInfo.java
Unescape Escape View File

@ -0,0 +1,163 @@
package com.hw.dms.domain;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 附件信息对象 mes_base_attach_info
*
* @author Yinq
* @date 2024-01-26
*/
public class BaseAttachInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键标识
*/
private Long attachId;
/**
* 附件编号
*/
@Excel(name = "附件编号")
private String attachCode;
/**
* 附件名称
*/
@Excel(name = "附件名称")
private String attachName;
/**
* 附件类别：1-加工图纸；2-SOP；9-其他文件
*/
@Excel(name = "附件类别")
private String attachType;
/**
* 附件路径
*/
@Excel(name = "附件路径")
private String attachPath;
/**
* 所属工序
*/
@Excel(name = "所属工序")
private Long processId;
/**
* 激活标识
*/
@Excel(name = "激活标识")
private String activeFlag;
/**附件ID,多个以,隔开*/
private String attachIdStr;
/** 是否已下发图纸，下发dispatchFlag为true，下发dispatchFlag为true,默认为false*/
private boolean dispatchFlag = false;
private String url;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public void setAttachId(Long attachId) {
this.attachId = attachId;
}
public Long getAttachId() {
return attachId;
}
public void setAttachCode(String attachCode) {
this.attachCode = attachCode;
}
public String getAttachCode() {
return attachCode;
}
public void setAttachName(String attachName) {
this.attachName = attachName;
}
public String getAttachName() {
return attachName;
}
public void setAttachType(String attachType) {
this.attachType = attachType;
}
public String getAttachType() {
return attachType;
}
public void setAttachPath(String attachPath) {
this.attachPath = attachPath;
}
public String getAttachPath() {
return attachPath;
}
public void setProcessId(Long processId) {
this.processId = processId;
}
public Long getProcessId() {
return processId;
}
public void setActiveFlag(String activeFlag) {
this.activeFlag = activeFlag;
}
public String getActiveFlag() {
return activeFlag;
}
public String getAttachIdStr() {
return attachIdStr;
}
public void setAttachIdStr(String attachIdStr) {
this.attachIdStr = attachIdStr;
}
public boolean isDispatchFlag() {
return dispatchFlag;
}
public void setDispatchFlag(boolean dispatchFlag) {
this.dispatchFlag = dispatchFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("attachId", getAttachId())
.append("attachCode", getAttachCode())
.append("attachName", getAttachName())
.append("attachType", getAttachType())
.append("attachPath", getAttachPath())
.append("processId", getProcessId())
.append("activeFlag", getActiveFlag())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

20
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseDeviceInstall.java
Unescape Escape View File

@ -43,6 +43,26 @@ public class DmsBaseDeviceInstall extends BaseEntity
private String deviceName;
private Date beginTime;
private Date endTime;
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public String getDeviceName() {
return deviceName;
}

46
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectRouteDetail.java
Unescape Escape View File

@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity;
/**
* 巡检线路明细对象 dms_inspect_route_detail
*
*
* @author Open Platform
* @date 2024-01-16
*/
@ -38,57 +38,77 @@ public class DmsInspectRouteDetail extends BaseEntity
@Excel(name = "是否标识：1-是；0-否")
private String isFlag;
public void setRouteDetailId(Long routeDetailId)
private String deviceName;
private String standardName;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getStandardName() {
return standardName;
}
public void setStandardName(String standardName) {
this.standardName = standardName;
}
public void setRouteDetailId(Long routeDetailId)
{
this.routeDetailId = routeDetailId;
}
public Long getRouteDetailId()
public Long getRouteDetailId()
{
return routeDetailId;
}
public void setInspectRouteId(Long inspectRouteId)
public void setInspectRouteId(Long inspectRouteId)
{
this.inspectRouteId = inspectRouteId;
}
public Long getInspectRouteId()
public Long getInspectRouteId()
{
return inspectRouteId;
}
public void setLineStep(Long lineStep)
public void setLineStep(Long lineStep)
{
this.lineStep = lineStep;
}
public Long getLineStep()
public Long getLineStep()
{
return lineStep;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public Long getDeviceId()
{
return deviceId;
}
public void setInspectStandard(String inspectStandard)
public void setInspectStandard(String inspectStandard)
{
this.inspectStandard = inspectStandard;
}
public String getInspectStandard()
public String getInspectStandard()
{
return inspectStandard;
}
public void setIsFlag(String isFlag)
public void setIsFlag(String isFlag)
{
this.isFlag = isFlag;
}
public String getIsFlag()
public String getIsFlag()
{
return isFlag;
}

29
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInstanceFile.java
Unescape Escape View File

@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity;
/**
* 工单文件;手工创建，从故障报修开始对象 dms_instance_file
*
*
* @author xins
* @date 2024-03-13
*/
@ -30,39 +30,50 @@ public class DmsInstanceFile extends BaseEntity
@Excel(name = "故障文件地址，一般是图片")
private String filePath;
public void setInstanceFileId(Long instanceFileId)
//file-list中需要有url才能正确预览图片
private String url;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public void setInstanceFileId(Long instanceFileId)
{
this.instanceFileId = instanceFileId;
}
public Long getInstanceFileId()
public Long getInstanceFileId()
{
return instanceFileId;
}
public void setTargetType(String targetType)
public void setTargetType(String targetType)
{
this.targetType = targetType;
}
public String getTargetType()
public String getTargetType()
{
return targetType;
}
public void setTargetId(Long targetId)
public void setTargetId(Long targetId)
{
this.targetId = targetId;
}
public Long getTargetId()
public Long getTargetId()
{
return targetId;
}
public void setFilePath(String filePath)
public void setFilePath(String filePath)
{
this.filePath = filePath;
}
public String getFilePath()
public String getFilePath()
{
return filePath;
}

63
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeLube.java
Unescape Escape View File

@ -1,13 +1,16 @@
package com.hw.dms.domain;
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;
import com.hw.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* 润滑知识库对象 dms_knowledge_lube
*
*
* @author caoql
* @date 2024-02-26
*/
@ -42,66 +45,96 @@ public class DmsKnowledgeLube extends BaseEntity
@Excel(name = "是否标识：1-是；0-否")
private String isFlag;
public void setKnowledgeLubeId(Long knowledgeLubeId)
List<String> fileUrls;
List<SysFile> systemFiles;
List<BaseAttachInfo> attachments;
public List<BaseAttachInfo> getAttachments() {
return attachments;
}
public void setAttachments(List<BaseAttachInfo> attachments) {
this.attachments = attachments;
}
public List<SysFile> getSystemFiles() {
return systemFiles;
}
public void setSystemFiles(List<SysFile> systemFiles) {
this.systemFiles = systemFiles;
}
public List<String> getFileUrls() {
return fileUrls;
}
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
public void setKnowledgeLubeId(Long knowledgeLubeId)
{
this.knowledgeLubeId = knowledgeLubeId;
}
public Long getKnowledgeLubeId()
public Long getKnowledgeLubeId()
{
return knowledgeLubeId;
}
public void setExperienceCode(String experienceCode)
public void setExperienceCode(String experienceCode)
{
this.experienceCode = experienceCode;
}
public String getExperienceCode()
public String getExperienceCode()
{
return experienceCode;
}
public void setDeviceTypeId(Long deviceTypeId)
public void setDeviceTypeId(Long deviceTypeId)
{
this.deviceTypeId = deviceTypeId;
}
public Long getDeviceTypeId()
public Long getDeviceTypeId()
{
return deviceTypeId;
}
public void setLubeStationId(Long lubeStationId)
public void setLubeStationId(Long lubeStationId)
{
this.lubeStationId = lubeStationId;
}
public Long getLubeStationId()
public Long getLubeStationId()
{
return lubeStationId;
}
public void setProtocolCode(String protocolCode)
public void setProtocolCode(String protocolCode)
{
this.protocolCode = protocolCode;
}
public String getProtocolCode()
public String getProtocolCode()
{
return protocolCode;
}
public void setOperationsDescription(String operationsDescription)
public void setOperationsDescription(String operationsDescription)
{
this.operationsDescription = operationsDescription;
}
public String getOperationsDescription()
public String getOperationsDescription()
{
return operationsDescription;
}
public void setIsFlag(String isFlag)
public void setIsFlag(String isFlag)
{
this.isFlag = isFlag;
}
public String getIsFlag()
public String getIsFlag()
{
return isFlag;
}

53
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeMaint.java
Unescape Escape View File

@ -1,13 +1,16 @@
package com.hw.dms.domain;
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;
import com.hw.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* 保养知识库对象 dms_knowledge_maint
*
*
* @author Open Platform
* @date 2024-02-26
*/
@ -42,66 +45,86 @@ public class DmsKnowledgeMaint extends BaseEntity
@Excel(name = "是否标识：1-是；0-否")
private String isFlag;
public void setKnowledgeMaintId(Long knowledgeMaintId)
List<String> fileUrls;
List<SysFile> systemFiles;
public List<String> getFileUrls() {
return fileUrls;
}
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
public List<SysFile> getSystemFiles() {
return systemFiles;
}
public void setSystemFiles(List<SysFile> systemFiles) {
this.systemFiles = systemFiles;
}
public void setKnowledgeMaintId(Long knowledgeMaintId)
{
this.knowledgeMaintId = knowledgeMaintId;
}
public Long getKnowledgeMaintId()
public Long getKnowledgeMaintId()
{
return knowledgeMaintId;
}
public void setExperienceCode(String experienceCode)
public void setExperienceCode(String experienceCode)
{
this.experienceCode = experienceCode;
}
public String getExperienceCode()
public String getExperienceCode()
{
return experienceCode;
}
public void setDeviceTypeId(Long deviceTypeId)
public void setDeviceTypeId(Long deviceTypeId)
{
this.deviceTypeId = deviceTypeId;
}
public Long getDeviceTypeId()
public Long getDeviceTypeId()
{
return deviceTypeId;
}
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)
public void setMaintProtocol(String maintProtocol)
{
this.maintProtocol = maintProtocol;
}
public String getMaintProtocol()
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(String isFlag)
public void setIsFlag(String isFlag)
{
this.isFlag = isFlag;
}
public String getIsFlag()
public String getIsFlag()
{
return isFlag;
}

53
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeRepair.java
Unescape Escape View File

@ -1,13 +1,16 @@
package com.hw.dms.domain;
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;
import com.hw.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* 维修知识库对象 dms_knowledge_repair
*
*
* @author Open Platform
* @date 2024-02-26
*/
@ -42,66 +45,86 @@ public class DmsKnowledgeRepair extends BaseEntity
@Excel(name = "是否标识：1-是；0-否")
private String isFlag;
public void setKnowledgeRepairId(Long knowledgeRepairId)
List<String> fileUrls;
List<SysFile> systemFiles;
public List<String> getFileUrls() {
return fileUrls;
}
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
public List<SysFile> getSystemFiles() {
return systemFiles;
}
public void setSystemFiles(List<SysFile> systemFiles) {
this.systemFiles = systemFiles;
}
public void setKnowledgeRepairId(Long knowledgeRepairId)
{
this.knowledgeRepairId = knowledgeRepairId;
}
public Long getKnowledgeRepairId()
public Long getKnowledgeRepairId()
{
return knowledgeRepairId;
}
public void setExperienceCode(String experienceCode)
public void setExperienceCode(String experienceCode)
{
this.experienceCode = experienceCode;
}
public String getExperienceCode()
public String getExperienceCode()
{
return experienceCode;
}
public void setDeviceTypeId(Long deviceTypeId)
public void setDeviceTypeId(Long deviceTypeId)
{
this.deviceTypeId = deviceTypeId;
}
public Long getDeviceTypeId()
public Long getDeviceTypeId()
{
return deviceTypeId;
}
public void setFaultDescription(String faultDescription)
public void setFaultDescription(String faultDescription)
{
this.faultDescription = faultDescription;
}
public String getFaultDescription()
public String getFaultDescription()
{
return faultDescription;
}
public void setDesignOperations(String designOperations)
public void setDesignOperations(String designOperations)
{
this.designOperations = designOperations;
}
public String getDesignOperations()
public String getDesignOperations()
{
return designOperations;
}
public void setOperationsDescription(String operationsDescription)
public void setOperationsDescription(String operationsDescription)
{
this.operationsDescription = operationsDescription;
}
public String getOperationsDescription()
public String getOperationsDescription()
{
return operationsDescription;
}
public void setIsFlag(String isFlag)
public void setIsFlag(String isFlag)
{
this.isFlag = isFlag;
}
public String getIsFlag()
public String getIsFlag()
{
return isFlag;
}

60
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLubeDetail.java
Unescape Escape View File

@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity;
/**
* 润滑计划明细对象 dms_plan_lube_detail
*
*
* @author xins
* @date 2024-03-21
*/
@ -42,66 +42,96 @@ public class DmsPlanLubeDetail extends BaseEntity
@Excel(name = "是否标识：1-是；2-否")
private Long isFlag;
public void setPlanLubeDetailId(Long planLubeDetailId)
private String deviceName;
private String lubeStationName;
private String lubeStandardCode;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getLubeStationName() {
return lubeStationName;
}
public void setLubeStationName(String lubeStationName) {
this.lubeStationName = lubeStationName;
}
public String getLubeStandardCode() {
return lubeStandardCode;
}
public void setLubeStandardCode(String lubeStandardCode) {
this.lubeStandardCode = lubeStandardCode;
}
public void setPlanLubeDetailId(Long planLubeDetailId)
{
this.planLubeDetailId = planLubeDetailId;
}
public Long getPlanLubeDetailId()
public Long getPlanLubeDetailId()
{
return planLubeDetailId;
}
public void setPlanLubeId(Long planLubeId)
public void setPlanLubeId(Long planLubeId)
{
this.planLubeId = planLubeId;
}
public Long getPlanLubeId()
public Long getPlanLubeId()
{
return planLubeId;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public Long getDeviceId()
{
return deviceId;
}
public void setLubeStationId(Long lubeStationId)
public void setLubeStationId(Long lubeStationId)
{
this.lubeStationId = lubeStationId;
}
public Long getLubeStationId()
public Long getLubeStationId()
{
return lubeStationId;
}
public void setLubeStandardId(Long lubeStandardId)
public void setLubeStandardId(Long lubeStandardId)
{
this.lubeStandardId = lubeStandardId;
}
public Long getLubeStandardId()
public Long getLubeStandardId()
{
return lubeStandardId;
}
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;
}

20
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java
Unescape Escape View File

@ -45,6 +45,26 @@ public class DmsPlanMaintDetail extends BaseEntity
private String maintStationName;
private String deviceName;
private String maintStationCode;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getMaintStationCode() {
return maintStationCode;
}
public void setMaintStationCode(String maintStationCode) {
this.maintStationCode = maintStationCode;
}
public Long getMaintStandardId() {
return maintStandardId;
}

81
hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanRepairDetail.java
Unescape Escape View File

@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity;
/**
* 检修计划明细对象 dms_plan_repair_detail
*
*
* @author Open Platform
* @date 2024-01-15
*/
@ -22,9 +22,13 @@ public class DmsPlanRepairDetail extends BaseEntity
@Excel(name = "计划ID，关联dms_plan_repair的plan_maint_id")
private Long planRepairId;
/** 设备ID，关联dms_base_device_ledger的device_id */
@Excel(name = "设备ID，关联dms_base_device_ledger的device_id")
private Long deviceId;
/** 检修计划明细ID,根据检修计划明细类型关联对应表的主键 */
@Excel(name = "检修计划明细ID,根据检修计划明细类型关联对应表的主键")
private Long repairDetailTargetId;
/** 检修计划明细类型(1设备，2设备类型) */
@Excel(name = "检修计划明细类型(1设备，2设备类型)")
private String repairDetailTargetType;
/** 故障类别（1、设备损坏） */
@Excel(name = "故障类别", readConverterExp = "1=、设备损坏")
@ -42,66 +46,94 @@ public class DmsPlanRepairDetail extends BaseEntity
@Excel(name = "操作描述")
private String operationDescription;
public void setPlanRepairDetailId(Long planRepairDetailId)
private String deviceName;
private String planRepairCode;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getPlanRepairCode() {
return planRepairCode;
}
public void setPlanRepairCode(String planRepairCode) {
this.planRepairCode = planRepairCode;
}
public Long getRepairDetailTargetId() {
return repairDetailTargetId;
}
public void setRepairDetailTargetId(Long repairDetailTargetId) {
this.repairDetailTargetId = repairDetailTargetId;
}
public String getRepairDetailTargetType() {
return repairDetailTargetType;
}
public void setRepairDetailTargetType(String repairDetailTargetType) {
this.repairDetailTargetType = repairDetailTargetType;
}
public void setPlanRepairDetailId(Long planRepairDetailId)
{
this.planRepairDetailId = planRepairDetailId;
}
public Long getPlanRepairDetailId()
public Long getPlanRepairDetailId()
{
return planRepairDetailId;
}
public void setPlanRepairId(Long planRepairId)
public void setPlanRepairId(Long planRepairId)
{
this.planRepairId = planRepairId;
}
public Long getPlanRepairId()
public Long getPlanRepairId()
{
return planRepairId;
}
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
{
return deviceId;
}
public void setFaultType(String faultType)
public void setFaultType(String faultType)
{
this.faultType = faultType;
}
public String getFaultType()
public String getFaultType()
{
return faultType;
}
public void setRepairDesc(String repairDesc)
public void setRepairDesc(String repairDesc)
{
this.repairDesc = repairDesc;
}
public String getRepairDesc()
public String getRepairDesc()
{
return repairDesc;
}
public void setRepairProtocol(String repairProtocol)
public void setRepairProtocol(String repairProtocol)
{
this.repairProtocol = repairProtocol;
}
public String getRepairProtocol()
public String getRepairProtocol()
{
return repairProtocol;
}
public void setOperationDescription(String operationDescription)
public void setOperationDescription(String operationDescription)
{
this.operationDescription = operationDescription;
}
public String getOperationDescription()
public String getOperationDescription()
{
return operationDescription;
}
@ -111,7 +143,6 @@ public class DmsPlanRepairDetail extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("planRepairDetailId", getPlanRepairDetailId())
.append("planRepairId", getPlanRepairId())
.append("deviceId", getDeviceId())
.append("faultType", getFaultType())
.append("repairDesc", getRepairDesc())
.append("repairProtocol", getRepairProtocol())

24
hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/BaseAttachInfoMapper.java
Unescape Escape View File

@ -0,0 +1,24 @@
package com.hw.dms.mapper;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.domain.DmsInstanceFile;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @ClassName : BaseAttachInfo
* @Description :
* @Author :
* @Date: 2024-04-08 09:30
*/
public interface BaseAttachInfoMapper {
//知识库存储文件
int batchDmsKnowLedgeLubeFile(List<BaseAttachInfo> baseAttachInfos);
//根据知识库主键id查询文件路径
List<String> selectListBaseAttachInfos(@Param("attachType") String attachType,@Param("processId") Long processId);
//更新时删除原有的图片
int deleteListBaseAttachInfos(@Param("attachType") String attachType,@Param("processId") Long processId);
}

7
hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectInstanceDetailProjectMapper.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.hw.dms.mapper;
import java.util.List;
import com.hw.dms.domain.DmsInspectInstanceDetailProject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.PathVariable;
/**
* 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Mapper接口
@ -73,4 +75,9 @@ public interface DmsInspectInstanceDetailProjectMapper
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectJoinList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* 通过工单id与巡检步骤查询工单明细项目信息
* */
List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectByInspectInstanceId(@Param("inspectInstanceId") Long inspectInstanceId, @Param("lineStep") Long lineStep);
}

19
hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectRouteDetailMapper.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsInspectRouteDetail;
/**
* 巡检线路明细Mapper接口
*
*
* @author Open Platform
* @date 2024-01-16
*/
public interface DmsInspectRouteDetailMapper
public interface DmsInspectRouteDetailMapper
{
/**
* 查询巡检线路明细
*
*
* @param routeDetailId 巡检线路明细主键
* @return 巡检线路明细
*/
@ -21,7 +21,7 @@ public interface DmsInspectRouteDetailMapper
/**
* 查询巡检线路明细列表
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 巡检线路明细集合
*/
@ -29,7 +29,7 @@ public interface DmsInspectRouteDetailMapper
/**
* 新增巡检线路明细
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 结果
*/
@ -37,7 +37,7 @@ public interface DmsInspectRouteDetailMapper
/**
* 修改巡检线路明细
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 结果
*/
@ -45,7 +45,7 @@ public interface DmsInspectRouteDetailMapper
/**
* 删除巡检线路明细
*
*
* @param routeDetailId 巡检线路明细主键
* @return 结果
*/
@ -53,9 +53,12 @@ public interface DmsInspectRouteDetailMapper
/**
* 批量删除巡检线路明细
*
*
* @param routeDetailIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteDmsInspectRouteDetailByRouteDetailIds(Long[] routeDetailIds);
List<DmsInspectRouteDetail> selectInspectRouteListByInspectRouteId(Long inspectRouteId);
}

6
hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInstanceFileMapper.java
Unescape Escape View File

@ -69,4 +69,10 @@ public interface DmsInstanceFileMapper
* @return 结果
*/
public int batchDmsInstanceFile(List<DmsInstanceFile> dmsInstanceFileList);
/**
* 更新时删除原有文件
* */
int deleteDmsInstanceFileByUpdate(Long targetId);
}

19
hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeDetailMapper.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanLubeDetail;
/**
* 润滑计划明细Mapper接口
*
*
* @author xins
* @date 2024-03-21
*/
public interface DmsPlanLubeDetailMapper
public interface DmsPlanLubeDetailMapper
{
/**
* 查询润滑计划明细
*
*
* @param planLubeDetailId 润滑计划明细主键
* @return 润滑计划明细
*/
@ -21,7 +21,7 @@ public interface DmsPlanLubeDetailMapper
/**
* 查询润滑计划明细列表
*
*
* @param dmsPlanLubeDetail 润滑计划明细
* @return 润滑计划明细集合
*/
@ -29,7 +29,7 @@ public interface DmsPlanLubeDetailMapper
/**
* 新增润滑计划明细
*
*
* @param dmsPlanLubeDetail 润滑计划明细
* @return 结果
*/
@ -37,7 +37,7 @@ public interface DmsPlanLubeDetailMapper
/**
* 修改润滑计划明细
*
*
* @param dmsPlanLubeDetail 润滑计划明细
* @return 结果
*/
@ -45,7 +45,7 @@ public interface DmsPlanLubeDetailMapper
/**
* 删除润滑计划明细
*
*
* @param planLubeDetailId 润滑计划明细主键
* @return 结果
*/
@ -53,9 +53,12 @@ public interface DmsPlanLubeDetailMapper
/**
* 批量删除润滑计划明细
*
*
* @param planLubeDetailIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteDmsPlanLubeDetailByPlanLubeDetailIds(Long[] planLubeDetailIds);
List<DmsPlanLubeDetail> selectPlanLubeDetailByPlanLubeId(Long planLubeId);
}

4
hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintDetailMapper.java
Unescape Escape View File

@ -68,4 +68,8 @@ public interface DmsPlanMaintDetailMapper
* @return 保养计划明细集合
*/
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail);
List<DmsPlanMaintDetail> selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId);
}

18
hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanRepairDetailMapper.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanRepairDetail;
/**
* 检修计划明细Mapper接口
*
*
* @author Open Platform
* @date 2024-01-15
*/
public interface DmsPlanRepairDetailMapper
public interface DmsPlanRepairDetailMapper
{
/**
* 查询检修计划明细
*
*
* @param planRepairDetailId 检修计划明细主键
* @return 检修计划明细
*/
@ -21,7 +21,7 @@ public interface DmsPlanRepairDetailMapper
/**
* 查询检修计划明细列表
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 检修计划明细集合
*/
@ -29,7 +29,7 @@ public interface DmsPlanRepairDetailMapper
/**
* 新增检修计划明细
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 结果
*/
@ -37,7 +37,7 @@ public interface DmsPlanRepairDetailMapper
/**
* 修改检修计划明细
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 结果
*/
@ -45,7 +45,7 @@ public interface DmsPlanRepairDetailMapper
/**
* 删除检修计划明细
*
*
* @param planRepairDetailId 检修计划明细主键
* @return 结果
*/
@ -53,9 +53,11 @@ public interface DmsPlanRepairDetailMapper
/**
* 批量删除检修计划明细
*
*
* @param planRepairDetailIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteDmsPlanRepairDetailByPlanRepairDetailIds(Long[] planRepairDetailIds);
List<DmsPlanRepairDetail> selectPlanRepairDetailByPlanRepairId(Long planRepairId);
}

63
hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectInstanceDetailProjectService.java
Unescape Escape View File

@ -0,0 +1,63 @@
package com.hw.dms.service;
import java.util.List;
import com.hw.dms.domain.DmsInspectInstanceDetailProject;
/**
* 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Service接口
*
* @author xins
* @date 2024-04-10
*/
public interface IDmsInspectInstanceDetailProjectService
{
/**
* 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键
* @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*/
public DmsInspectInstanceDetailProject selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId);
/**
* 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表
*
* @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
* @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情集合
*/
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
* @return 结果
*/
public int insertDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
* @return 结果
*/
public int updateDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* 批量删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param instanceDetailProjectIds 需要删除的点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键集合
* @return 结果
*/
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(Long[] instanceDetailProjectIds);
/**
* 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情信息
*
* @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键
* @return 结果
*/
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId);
List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectByInspectInstanceId(Long inspectInstanceId,Long lineStep);
}

18
hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectRouteDetailService.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsInspectRouteDetail;
/**
* 巡检线路明细Service接口
*
*
* @author Open Platform
* @date 2024-01-16
*/
public interface IDmsInspectRouteDetailService
public interface IDmsInspectRouteDetailService
{
/**
* 查询巡检线路明细
*
*
* @param routeDetailId 巡检线路明细主键
* @return 巡检线路明细
*/
@ -21,7 +21,7 @@ public interface IDmsInspectRouteDetailService
/**
* 查询巡检线路明细列表
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 巡检线路明细集合
*/
@ -29,7 +29,7 @@ public interface IDmsInspectRouteDetailService
/**
* 新增巡检线路明细
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 结果
*/
@ -37,7 +37,7 @@ public interface IDmsInspectRouteDetailService
/**
* 修改巡检线路明细
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 结果
*/
@ -45,7 +45,7 @@ public interface IDmsInspectRouteDetailService
/**
* 批量删除巡检线路明细
*
*
* @param routeDetailIds 需要删除的巡检线路明细主键集合
* @return 结果
*/
@ -53,9 +53,11 @@ public interface IDmsInspectRouteDetailService
/**
* 删除巡检线路明细信息
*
*
* @param routeDetailId 巡检线路明细主键
* @return 结果
*/
public int deleteDmsInspectRouteDetailByRouteDetailId(Long routeDetailId);
List<DmsInspectRouteDetail> selectInspectRouteListByInspectRouteId(Long inspectRouteId);
}

18
hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanLubeDetailService.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanLubeDetail;
/**
* 润滑计划明细Service接口
*
*
* @author xins
* @date 2024-03-21
*/
public interface IDmsPlanLubeDetailService
public interface IDmsPlanLubeDetailService
{
/**
* 查询润滑计划明细
*
*
* @param planLubeDetailId 润滑计划明细主键
* @return 润滑计划明细
*/
@ -21,7 +21,7 @@ public interface IDmsPlanLubeDetailService
/**
* 查询润滑计划明细列表
*
*
* @param dmsPlanLubeDetail 润滑计划明细
* @return 润滑计划明细集合
*/
@ -29,7 +29,7 @@ public interface IDmsPlanLubeDetailService
/**
* 新增润滑计划明细
*
*
* @param dmsPlanLubeDetail 润滑计划明细
* @return 结果
*/
@ -37,7 +37,7 @@ public interface IDmsPlanLubeDetailService
/**
* 修改润滑计划明细
*
*
* @param dmsPlanLubeDetail 润滑计划明细
* @return 结果
*/
@ -45,7 +45,7 @@ public interface IDmsPlanLubeDetailService
/**
* 批量删除润滑计划明细
*
*
* @param planLubeDetailIds 需要删除的润滑计划明细主键集合
* @return 结果
*/
@ -53,9 +53,11 @@ public interface IDmsPlanLubeDetailService
/**
* 删除润滑计划明细信息
*
*
* @param planLubeDetailId 润滑计划明细主键
* @return 结果
*/
public int deleteDmsPlanLubeDetailByPlanLubeDetailId(Long planLubeDetailId);
List<DmsPlanLubeDetail> selectPlanLubeDetailByPlanLubeId(Long planLubeId);
}

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintDetailService.java
Unescape Escape View File

@ -67,4 +67,7 @@ public interface IDmsPlanMaintDetailService
* @return 保养计划明细
*/
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail);
List<DmsPlanMaintDetail> selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId);
}

19
hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanRepairDetailService.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanRepairDetail;
/**
* 检修计划明细Service接口
*
*
* @author Open Platform
* @date 2024-01-15
*/
public interface IDmsPlanRepairDetailService
public interface IDmsPlanRepairDetailService
{
/**
* 查询检修计划明细
*
*
* @param planRepairDetailId 检修计划明细主键
* @return 检修计划明细
*/
@ -21,7 +21,7 @@ public interface IDmsPlanRepairDetailService
/**
* 查询检修计划明细列表
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 检修计划明细集合
*/
@ -29,7 +29,7 @@ public interface IDmsPlanRepairDetailService
/**
* 新增检修计划明细
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 结果
*/
@ -37,7 +37,7 @@ public interface IDmsPlanRepairDetailService
/**
* 修改检修计划明细
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 结果
*/
@ -45,7 +45,7 @@ public interface IDmsPlanRepairDetailService
/**
* 批量删除检修计划明细
*
*
* @param planRepairDetailIds 需要删除的检修计划明细主键集合
* @return 结果
*/
@ -53,9 +53,12 @@ public interface IDmsPlanRepairDetailService
/**
* 删除检修计划明细信息
*
*
* @param planRepairDetailId 检修计划明细主键
* @return 结果
*/
public int deleteDmsPlanRepairDetailByPlanRepairDetailId(Long planRepairDetailId);
List<DmsPlanRepairDetail> selectPlanRepairDetailByPlanRepairId(Long planRepairId);
}

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceDepreciationServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseDeviceDepreciationServiceImpl implements IDmsBaseDeviceDepre
@Override
public int insertDmsBaseDeviceDepreciation(DmsBaseDeviceDepreciation dmsBaseDeviceDepreciation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceDepreciation.setCreateBy(user.getUsername());
dmsBaseDeviceDepreciation.setIsFlag(1l);
dmsBaseDeviceDepreciation.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseDeviceDepreciationServiceImpl implements IDmsBaseDeviceDepre
@Override
public int updateDmsBaseDeviceDepreciation(DmsBaseDeviceDepreciation dmsBaseDeviceDepreciation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceDepreciation.setUpdateBy(user.getUsername());
dmsBaseDeviceDepreciation.setUpdateTime(DateUtils.getNowDate());
return dmsBaseDeviceDepreciationMapper.updateDmsBaseDeviceDepreciation(dmsBaseDeviceDepreciation);

6
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceFilesServiceImpl.java
Unescape Escape View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -64,7 +65,7 @@ public class DmsBaseDeviceFilesServiceImpl implements IDmsBaseDeviceFilesService
dmsBaseDeviceFiles.setFilesPath(url);
dmsBaseDeviceFiles.setCreateTime(DateUtils.getNowDate());
dmsBaseDeviceFiles.setIsFlag(1l);
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceFiles.setCreateBy(user.getUsername());
return dmsBaseDeviceFilesMapper.insertDmsBaseDeviceFiles(dmsBaseDeviceFiles);
}
@ -79,7 +80,8 @@ public class DmsBaseDeviceFilesServiceImpl implements IDmsBaseDeviceFilesService
public int updateDmsBaseDeviceFiles(DmsBaseDeviceFiles dmsBaseDeviceFiles)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
int index = dmsBaseDeviceFiles.getFilesPath().lastIndexOf("/");
String name = dmsBaseDeviceFiles.getFilesPath().substring(index+1);
dmsBaseDeviceFiles.setFilesName(name);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceParamServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseDeviceParamServiceImpl implements IDmsBaseDeviceParamService
@Override
public int insertDmsBaseDeviceParam(DmsBaseDeviceParam dmsBaseDeviceParam)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceParam.setCreateBy(user.getUsername());
dmsBaseDeviceParam.setIsFlag(1l);
dmsBaseDeviceParam.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseDeviceParamServiceImpl implements IDmsBaseDeviceParamService
@Override
public int updateDmsBaseDeviceParam(DmsBaseDeviceParam dmsBaseDeviceParam)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceParam.setUpdateBy(user.getUsername());
dmsBaseDeviceParam.setIsFlag(1l);
dmsBaseDeviceParam.setUpdateTime(DateUtils.getNowDate());

7
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceTypeServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsBaseDeviceBom;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
@ -55,7 +56,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService
@Override
public int insertDmsBaseDeviceType(DmsBaseDeviceType dmsBaseDeviceType)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceType.setCreateBy(user.getUsername());
dmsBaseDeviceType.setIsFlag(1l);
dmsBaseDeviceType.setCreateTime(DateUtils.getNowDate());
@ -65,7 +66,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService
}
else{
DmsBaseDeviceType dmsBaseDeviceType1 = new DmsBaseDeviceType();
dmsBaseDeviceType1.setParentId(dmsBaseDeviceType.getParentId());
dmsBaseDeviceType1.setDeviceTypeId(dmsBaseDeviceType.getParentId());
String ancestors = dmsBaseDeviceTypeMapper.selectDmsBaseDeviceTypeList(dmsBaseDeviceType1).get(0).getAncestors();
dmsBaseDeviceType.setAncestors(ancestors+","+dmsBaseDeviceType.getParentId());
}
@ -81,7 +82,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService
@Override
public int updateDmsBaseDeviceType(DmsBaseDeviceType dmsBaseDeviceType)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceType.setUpdateBy(user.getUsername());
dmsBaseDeviceType.setUpdateTime(DateUtils.getNowDate());
//如果有父级 则查询父级祖籍列表 +父级编号

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectProjectServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -57,7 +58,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
if (dmsBaseInspectProject.getInspectType()==null){
dmsBaseInspectProject.setInspectType("1");
}
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectProject.setIsFlag("1");
dmsBaseInspectProject.setCreateBy(user.getUsername());
dmsBaseInspectProject.setCreateTime(DateUtils.getNowDate());
@ -73,7 +74,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
@Override
public int updateDmsBaseInspectProject(DmsBaseInspectProject dmsBaseInspectProject)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectProject.setUpdateBy(user.getUsername());
dmsBaseInspectProject.setUpdateTime(DateUtils.getNowDate());
return dmsBaseInspectProjectMapper.updateDmsBaseInspectProject(dmsBaseInspectProject);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectRouteServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.log.annotation.Log;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -58,7 +59,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi
if (dmsBaseInspectRoute.getInspectType()==null){
dmsBaseInspectRoute.setInspectType("1");
}
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectRoute.setCreateBy(user.getUsername());
dmsBaseInspectRoute.setIsFlag("1");
dmsBaseInspectRoute.setCreateTime(DateUtils.getNowDate());
@ -74,7 +75,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi
@Override
public int updateDmsBaseInspectRoute(DmsBaseInspectRoute dmsBaseInspectRoute)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectRoute.setUpdateBy(user.getUsername());
dmsBaseInspectRoute.setUpdateTime(DateUtils.getNowDate());
return dmsBaseInspectRouteMapper.updateDmsBaseInspectRoute(dmsBaseInspectRoute);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectStandardServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -55,7 +56,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar
public int insertDmsBaseInspectStandard(DmsBaseInspectStandard dmsBaseInspectStandard)
{
dmsBaseInspectStandard.setIsFlag("1");
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectStandard.setCreateBy(user.getUsername());
dmsBaseInspectStandard.setCreateTime(DateUtils.getNowDate());
return dmsBaseInspectStandardMapper.insertDmsBaseInspectStandard(dmsBaseInspectStandard);
@ -70,7 +71,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar
@Override
public int updateDmsBaseInspectStandard(DmsBaseInspectStandard dmsBaseInspectStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectStandard.setUpdateBy(user.getUsername());
dmsBaseInspectStandard.setUpdateTime(DateUtils.getNowDate());
return dmsBaseInspectStandardMapper.updateDmsBaseInspectStandard(dmsBaseInspectStandard);

6
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi
@Override
public int insertDmsBaseLubeStandard(DmsBaseLubeStandard dmsBaseLubeStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseLubeStandard.setIsFlag("1");
dmsBaseLubeStandard.setCreateBy(user.getUsername());
dmsBaseLubeStandard.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,8 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi
@Override
public int updateDmsBaseLubeStandard(DmsBaseLubeStandard dmsBaseLubeStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseLubeStandard.setUpdateBy(user.getUsername());
dmsBaseLubeStandard.setUpdateTime(DateUtils.getNowDate());
return dmsBaseLubeStandardMapper.updateDmsBaseLubeStandard(dmsBaseLubeStandard);

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -70,7 +71,7 @@ public class DmsBaseLubeStationServiceImpl implements IDmsBaseLubeStationService
@Override
public int updateDmsBaseLubeStation(DmsBaseLubeStation dmsBaseLubeStation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseLubeStation.setUpdateBy(user.getUsername());
dmsBaseLubeStation.setUpdateTime(DateUtils.getNowDate());
return dmsBaseLubeStationMapper.updateDmsBaseLubeStation(dmsBaseLubeStation);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -55,7 +56,7 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer
public int insertDmsBaseMaintStandard(DmsBaseMaintStandard dmsBaseMaintStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStandard.setIsFlag(1l);
dmsBaseMaintStandard.setDeviceTypeId(0l);
dmsBaseMaintStandard.setCreateBy(user.getUsername());
@ -72,7 +73,7 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer
@Override
public int updateDmsBaseMaintStandard(DmsBaseMaintStandard dmsBaseMaintStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStandard.setUpdateBy(user.getUsername());
dmsBaseMaintStandard.setUpdateTime(DateUtils.getNowDate());

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStationServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi
@Override
public int insertDmsBaseMaintStation(DmsBaseMaintStation dmsBaseMaintStation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStation.setIsFlag(1l);
dmsBaseMaintStation.setCreateBy(user.getUsername());
dmsBaseMaintStation.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi
@Override
public int updateDmsBaseMaintStation(DmsBaseMaintStation dmsBaseMaintStation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStation.setUpdateBy(user.getUsername());
dmsBaseMaintStation.setUpdateTime(DateUtils.getNowDate());
return dmsBaseMaintStationMapper.updateDmsBaseMaintStation(dmsBaseMaintStation);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseOutsrcInfoServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseOutsrcInfoServiceImpl implements IDmsBaseOutsrcInfoService
@Override
public int insertDmsBaseOutsrcInfo(DmsBaseOutsrcInfo dmsBaseOutsrcInfo)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseOutsrcInfo.setIsFlag(1l);
dmsBaseOutsrcInfo.setCreateBy(user.getUsername());
dmsBaseOutsrcInfo.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseOutsrcInfoServiceImpl implements IDmsBaseOutsrcInfoService
@Override
public int updateDmsBaseOutsrcInfo(DmsBaseOutsrcInfo dmsBaseOutsrcInfo)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseOutsrcInfo.setUpdateBy(user.getUsername());
dmsBaseOutsrcInfo.setUpdateTime(DateUtils.getNowDate());
return dmsBaseOutsrcInfoMapper.updateDmsBaseOutsrcInfo(dmsBaseOutsrcInfo);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutReasonServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService
@Override
public int insertDmsBaseShutReason(DmsBaseShutReason dmsBaseShutReason)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseShutReason.setIsFlag("1");
dmsBaseShutReason.setCreateBy(user.getUsername());
dmsBaseShutReason.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService
@Override
public int updateDmsBaseShutReason(DmsBaseShutReason dmsBaseShutReason)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseShutReason.setUpdateBy(user.getUsername());
dmsBaseShutReason.setUpdateTime(DateUtils.getNowDate());
return dmsBaseShutReasonMapper.updateDmsBaseShutReason(dmsBaseShutReason);

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutTypeServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseShutTypeServiceImpl implements IDmsBaseShutTypeService
@Override
public int insertDmsBaseShutType(DmsBaseShutType dmsBaseShutType)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseShutType.setIsFlag("1");
dmsBaseShutType.setCreateBy(user.getUsername());
dmsBaseShutType.setCreateTime(DateUtils.getNowDate());

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseSpecialdeviceParamServiceImpl implements IDmsBaseSpecialdevi
@Override
public int insertDmsBaseSpecialdeviceParam(DmsBaseSpecialdeviceParam dmsBaseSpecialdeviceParam)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseSpecialdeviceParam.setCreateBy(user.getUsername());
dmsBaseSpecialdeviceParam.setIsFlag(1l);
dmsBaseSpecialdeviceParam.setCreateTime(DateUtils.getNowDate());

19
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.hw.dms.service.impl;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -54,7 +55,13 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
queryInstanceFile.setTargetId(dmsBillsFaultInstance.getInstanceActivityId());
List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
for (DmsInstanceFile dmsInstanceFile : dmsInstanceFiles){
dmsInstanceFile.setUrl(dmsInstanceFile.getFilePath());
}
dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
// dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType());
// dmsBillsFaultInstance.setFaultDescription(dmsFaultInstanceActivity.getFaultDescription());
// dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations());
@ -128,8 +135,14 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
*/
@Override
public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
dmsBillsFaultInstance.setUpdateTime(DateUtils.getNowDate());
return dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance);
dmsInstanceFileMapper.deleteDmsInstanceFileByUpdate(dmsBillsFaultInstance.getRepairInstanceId());
int i = dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance);
//存储图片
List<String> fileUrls = dmsBillsFaultInstance.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsBillsFaultInstance.getInstanceActivityId());
return i;
}
/**
@ -238,9 +251,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
@Override
@Transactional(rollbackFor = Exception.class)
public int updateDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity) {
//存储图片
List<String> fileUrls = dmsFaultInstanceActivity.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsFaultInstanceActivity.getInstanceActivityId());
return dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity);
}

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java
Unescape Escape View File

@ -89,7 +89,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
*/
@Override
public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) {
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
//写死105，也可根据传入对象的wfprocessid作为传参。
Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l);
if (dmsBillsInspectInstance.getInspectType().equals("1")) {
@ -99,12 +99,13 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
}
dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate());
dmsBillsInspectInstance.setIsFlag("1");
dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT);
dmsBillsInspectInstance.setCreateBy(user.getUsername());
int i = dmsBillsInspectInstanceMapper.insertDmsBillsInspectInstance(dmsBillsInspectInstance);
List<DmsBillsInspectInstance> dmsBillsInspectInstances = dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance);
//新建第一步工单实例节点
DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity = new DmsBillsInspectInstanceActivity();
dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstances.get(0).getInspectInstanceId());
dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstance.getInspectInstanceId());
dmsBillsInspectInstanceActivity.setInspectRouteId(dmsBillsInspectInstance.getInspectRouteId());
dmsBillsInspectInstanceActivity.setDeviceAmount(dmsBillsInspectInstance.getDeviceAmount());
dmsBillsInspectInstanceActivity.setPerformer(dmsBillsInspectInstance.getPerformer());

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.Arrays;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.*;
import com.hw.dms.mapper.DmsBillsLubeInstanceMapper;
import com.hw.dms.service.IDmsPlanLubeService;
@ -61,7 +62,7 @@ public class DmsBillsLubeInstanceActivityServiceImpl implements IDmsBillsLubeIns
@Override
public int insertDmsBillsLubeInstanceActivity(DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBillsLubeInstanceActivity.setCreateBy(user.getUsername());
dmsBillsLubeInstanceActivity.setStartTime(DateUtils.getNowDate());
dmsBillsLubeInstanceActivity.setCreateTime(DateUtils.getNowDate());

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.Arrays;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.*;
import com.hw.dms.mapper.DmsBillsFaultInstanceMapper;
import com.hw.system.api.model.LoginUser;
@ -58,7 +59,7 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
@Override
public int insertDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsFaultInstanceActivity.setCreateBy(user.getUsername());
dmsFaultInstanceActivity.setStartTime(DateUtils.getNowDate());
dmsFaultInstanceActivity.setCreateTime(DateUtils.getNowDate());

101
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java
Unescape Escape View File

@ -0,0 +1,101 @@
package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsInspectInstanceDetailProjectMapper;
import com.hw.dms.domain.DmsInspectInstanceDetailProject;
import com.hw.dms.service.IDmsInspectInstanceDetailProjectService;
/**
* 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Service业务层处理
*
* @author xins
* @date 2024-04-10
*/
@Service
public class DmsInspectInstanceDetailProjectServiceImpl implements IDmsInspectInstanceDetailProjectService
{
@Autowired
private DmsInspectInstanceDetailProjectMapper dmsInspectInstanceDetailProjectMapper;
/**
* 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键
* @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*/
@Override
public DmsInspectInstanceDetailProject selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId)
{
return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId);
}
/**
* 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表
*
* @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
* @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*/
@Override
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject);
}
/**
* 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
* @return 结果
*/
@Override
public int insertDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
dmsInspectInstanceDetailProject.setCreateTime(DateUtils.getNowDate());
return dmsInspectInstanceDetailProjectMapper.insertDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject);
}
/**
* 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情
* @return 结果
*/
@Override
public int updateDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
dmsInspectInstanceDetailProject.setUpdateTime(DateUtils.getNowDate());
return dmsInspectInstanceDetailProjectMapper.updateDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject);
}
/**
* 批量删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情
*
* @param instanceDetailProjectIds 需要删除的点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键
* @return 结果
*/
@Override
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(Long[] instanceDetailProjectIds)
{
return dmsInspectInstanceDetailProjectMapper.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(instanceDetailProjectIds);
}
/**
* 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情信息
*
* @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键
* @return 结果
*/
@Override
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId)
{
return dmsInspectInstanceDetailProjectMapper.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId);
}
@Override
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectByInspectInstanceId(Long inspectInstanceId, Long lineStep) {
return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectByInspectInstanceId(inspectInstanceId,lineStep);
}
}

21
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectRouteDetailServiceImpl.java
Unescape Escape View File

@ -9,19 +9,19 @@ import com.hw.dms.service.IDmsInspectRouteDetailService;
/**
* 巡检线路明细Service业务层处理
*
*
* @author Open Platform
* @date 2024-01-16
*/
@Service
public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailService
public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailService
{
@Autowired
private DmsInspectRouteDetailMapper dmsInspectRouteDetailMapper;
/**
* 查询巡检线路明细
*
*
* @param routeDetailId 巡检线路明细主键
* @return 巡检线路明细
*/
@ -33,7 +33,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
/**
* 查询巡检线路明细列表
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 巡检线路明细
*/
@ -45,7 +45,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
/**
* 新增巡检线路明细
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 结果
*/
@ -57,7 +57,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
/**
* 修改巡检线路明细
*
*
* @param dmsInspectRouteDetail 巡检线路明细
* @return 结果
*/
@ -69,7 +69,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
/**
* 批量删除巡检线路明细
*
*
* @param routeDetailIds 需要删除的巡检线路明细主键
* @return 结果
*/
@ -81,7 +81,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
/**
* 删除巡检线路明细信息
*
*
* @param routeDetailId 巡检线路明细主键
* @return 结果
*/
@ -90,4 +90,9 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
{
return dmsInspectRouteDetailMapper.deleteDmsInspectRouteDetailByRouteDetailId(routeDetailId);
}
@Override
public List<DmsInspectRouteDetail> selectInspectRouteListByInspectRouteId(Long inspectRouteId) {
return dmsInspectRouteDetailMapper.selectInspectRouteListByInspectRouteId(inspectRouteId);
}
}

63
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeLubeServiceImpl.java
Unescape Escape View File

@ -1,15 +1,23 @@
package com.hw.dms.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.hw.common.core.constant.DmsConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.dms.domain.DmsBaseLubeStation;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.domain.DmsInstanceFile;
import com.hw.dms.mapper.BaseAttachInfoMapper;
import com.hw.dms.mapper.DmsBaseLubeStationMapper;
import com.hw.system.api.domain.SysFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsKnowledgeLubeMapper;
import com.hw.dms.domain.DmsKnowledgeLube;
import com.hw.dms.service.IDmsKnowledgeLubeService;
import javax.security.auth.login.Configuration;
/**
* 润滑知识库Service业务层处理
*
@ -23,6 +31,8 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
private DmsKnowledgeLubeMapper dmsKnowledgeLubeMapper;
@Autowired
private DmsBaseLubeStationMapper dmsBaseLubeStationMapper;
@Autowired
private BaseAttachInfoMapper baseAttachInfoMapper;
/**
* 查询润滑知识库
@ -33,7 +43,17 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
@Override
public DmsKnowledgeLube selectDmsKnowledgeLubeByKnowledgeLubeId(Long knowledgeLubeId)
{
return dmsKnowledgeLubeMapper.selectDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId);
DmsKnowledgeLube dmsKnowledgeLube = dmsKnowledgeLubeMapper.selectDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId);
List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE,dmsKnowledgeLube.getKnowledgeLubeId());
List<SysFile> sysFiles = new ArrayList<SysFile>();
for (String string:baseAttachInfos){
SysFile sysFile = new SysFile();
sysFile.setUrl(string);
sysFiles.add(sysFile);
}
dmsKnowledgeLube.setSystemFiles(sysFiles);
return dmsKnowledgeLube;
}
/**
@ -60,7 +80,13 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
dmsKnowledgeLube.setCreateTime(DateUtils.getNowDate());
dmsKnowledgeLube.setIsFlag("1");
return dmsKnowledgeLubeMapper.insertDmsKnowledgeLube(dmsKnowledgeLube);
int i = dmsKnowledgeLubeMapper.insertDmsKnowledgeLube(dmsKnowledgeLube);
//存储图片
List<String> fileUrls = dmsKnowledgeLube.getFileUrls();
batchInsertInstanceFiles(fileUrls,dmsKnowledgeLube.getKnowledgeLubeId());
return i;
}
/**
@ -73,7 +99,14 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
public int updateDmsKnowledgeLube(DmsKnowledgeLube dmsKnowledgeLube)
{
dmsKnowledgeLube.setUpdateTime(DateUtils.getNowDate());
return dmsKnowledgeLubeMapper.updateDmsKnowledgeLube(dmsKnowledgeLube);
int i = dmsKnowledgeLubeMapper.updateDmsKnowledgeLube(dmsKnowledgeLube);
baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE,dmsKnowledgeLube.getKnowledgeLubeId());
//存储图片
List<String> fileUrls = dmsKnowledgeLube.getFileUrls();
if (fileUrls!=null) {
batchInsertInstanceFiles(fileUrls, dmsKnowledgeLube.getKnowledgeLubeId());
}
return i;
}
/**
@ -99,4 +132,26 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
{
return dmsKnowledgeLubeMapper.deleteDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId);
}
public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
if (fileUrls != null && !fileUrls.isEmpty()) {
// List<DmsInstanceFile> dmsInstanceFiles = new ArrayList<>();
// for (String fileUrl : fileUrls) {
// DmsInstanceFile dmsInstanceFile = new DmsInstanceFile();
// dmsInstanceFile.setTargetId(instanceActivityId);
// dmsInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
// dmsInstanceFile.setFilePath(fileUrl);
// dmsInstanceFiles.add(dmsInstanceFile);
// }
List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
for (String fileUrl : fileUrls){
BaseAttachInfo baseAttachInfo = new BaseAttachInfo();
baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE);
baseAttachInfo.setAttachName("name");
baseAttachInfo.setAttachPath(fileUrl);
baseAttachInfo.setProcessId(knowledgeLubeId);
baseAttachInfos.add(baseAttachInfo);
}
baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
}
}
}

49
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeMaintServiceImpl.java
Unescape Escape View File

@ -1,9 +1,15 @@
package com.hw.dms.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.hw.common.core.constant.DmsConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.domain.DmsBaseMaintStation;
import com.hw.dms.mapper.BaseAttachInfoMapper;
import com.hw.dms.mapper.DmsBaseMaintStationMapper;
import com.hw.system.api.domain.SysFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsKnowledgeMaintMapper;
@ -24,6 +30,8 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
@Autowired
private DmsBaseMaintStationMapper dmsBaseMaintStationMapper;
@Autowired
private BaseAttachInfoMapper baseAttachInfoMapper;
/**
* 查询保养知识库
*
@ -33,7 +41,17 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
@Override
public DmsKnowledgeMaint selectDmsKnowledgeMaintByKnowledgeMaintId(Long knowledgeMaintId)
{
return dmsKnowledgeMaintMapper.selectDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId);
DmsKnowledgeMaint dmsKnowledgeMaint = dmsKnowledgeMaintMapper.selectDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId);
List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT,dmsKnowledgeMaint.getKnowledgeMaintId());
List<SysFile> sysFiles = new ArrayList<SysFile>();
for (String string:baseAttachInfos){
SysFile sysFile = new SysFile();
sysFile.setUrl(string);
sysFiles.add(sysFile);
}
dmsKnowledgeMaint.setSystemFiles(sysFiles);
return dmsKnowledgeMaint;
}
/**
@ -60,7 +78,11 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
dmsKnowledgeMaint.setCreateTime(DateUtils.getNowDate());
dmsKnowledgeMaint.setIsFlag("1");
return dmsKnowledgeMaintMapper.insertDmsKnowledgeMaint(dmsKnowledgeMaint);
int i = dmsKnowledgeMaintMapper.insertDmsKnowledgeMaint(dmsKnowledgeMaint);
//存储图片
List<String> fileUrls = dmsKnowledgeMaint.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsKnowledgeMaint.getKnowledgeMaintId());
return i;
}
/**
@ -73,7 +95,13 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
public int updateDmsKnowledgeMaint(DmsKnowledgeMaint dmsKnowledgeMaint)
{
dmsKnowledgeMaint.setUpdateTime(DateUtils.getNowDate());
return dmsKnowledgeMaintMapper.updateDmsKnowledgeMaint(dmsKnowledgeMaint);
int i = dmsKnowledgeMaintMapper.updateDmsKnowledgeMaint(dmsKnowledgeMaint);
baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT,dmsKnowledgeMaint.getKnowledgeMaintId());
List<String> fileUrls = dmsKnowledgeMaint.getFileUrls();
if (fileUrls!=null) {
batchInsertInstanceFiles(fileUrls, dmsKnowledgeMaint.getKnowledgeMaintId());
}
return i;
}
/**
@ -99,4 +127,19 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
{
return dmsKnowledgeMaintMapper.deleteDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId);
}
public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
if (fileUrls != null && !fileUrls.isEmpty()) {
List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
for (String fileUrl : fileUrls){
BaseAttachInfo baseAttachInfo = new BaseAttachInfo();
baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT);
baseAttachInfo.setAttachName("name");
baseAttachInfo.setAttachPath(fileUrl);
baseAttachInfo.setProcessId(knowledgeLubeId);
baseAttachInfos.add(baseAttachInfo);
}
baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
}
}
}

54
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeRepairServiceImpl.java
Unescape Escape View File

@ -1,7 +1,13 @@
package com.hw.dms.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.hw.common.core.constant.DmsConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.mapper.BaseAttachInfoMapper;
import com.hw.system.api.domain.SysFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsKnowledgeRepairMapper;
@ -20,6 +26,9 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
@Autowired
private DmsKnowledgeRepairMapper dmsKnowledgeRepairMapper;
@Autowired
private BaseAttachInfoMapper baseAttachInfoMapper;
/**
* 查询维修知识库
*
@ -29,7 +38,17 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
@Override
public DmsKnowledgeRepair selectDmsKnowledgeRepairByKnowledgeRepairId(Long knowledgeRepairId)
{
return dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
DmsKnowledgeRepair dmsKnowledgeRepair = dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
List<SysFile> sysFiles = new ArrayList<SysFile>();
for (String string:baseAttachInfos){
SysFile sysFile = new SysFile();
sysFile.setUrl(string);
sysFiles.add(sysFile);
}
dmsKnowledgeRepair.setSystemFiles(sysFiles);
return dmsKnowledgeRepair;
}
/**
@ -55,7 +74,12 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
{
dmsKnowledgeRepair.setCreateTime(DateUtils.getNowDate());
dmsKnowledgeRepair.setIsFlag("1");
return dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair);
int i = dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair);
//存储图片
List<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());
return i;
}
/**
@ -68,7 +92,15 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
public int updateDmsKnowledgeRepair(DmsKnowledgeRepair dmsKnowledgeRepair)
{
dmsKnowledgeRepair.setUpdateTime(DateUtils.getNowDate());
return dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair);
int i = dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair);
baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
//存储图片
List<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
if(fileUrls!=null) {
batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());
}
return i;
}
/**
@ -94,4 +126,20 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
{
return dmsKnowledgeRepairMapper.deleteDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
}
public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
if (fileUrls != null && !fileUrls.isEmpty()) {
List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
for (String fileUrl : fileUrls){
BaseAttachInfo baseAttachInfo = new BaseAttachInfo();
baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR);
baseAttachInfo.setAttachName("name");
baseAttachInfo.setAttachPath(fileUrl);
baseAttachInfo.setProcessId(knowledgeLubeId);
baseAttachInfos.add(baseAttachInfo);
}
baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
}
}
}

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.Arrays;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsBillsMaintInstance;
import com.hw.dms.domain.DmsRepairInstance;
import com.hw.dms.domain.DmsRepairInstanceActivity;
@ -61,7 +62,7 @@ public class DmsMaintInstanceActivityServiceImpl implements IDmsMaintInstanceAct
@Override
public int insertDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsMaintInstanceActivity.setCreateBy(user.getUsername());
dmsMaintInstanceActivity.setCreateTime(DateUtils.getNowDate());
dmsMaintInstanceActivity.setStartTime(DateUtils.getNowDate());

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java
Unescape Escape View File

@ -6,6 +6,7 @@ import java.util.List;
import com.hw.common.core.constant.SecurityConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.core.web.domain.AjaxResult;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.job.api.RemoteJobService;
import com.hw.job.api.domain.SysJob;
import com.hw.job.api.util.CronUtils;
@ -67,7 +68,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService
//通过cron表达式获取下一次执行时间
Date nextExecution = CronUtils.getNextExecution(time);
dmsPlanInspect.setPlanTime(nextExecution);
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsPlanInspect.setCreateBy(user.getUsername());
dmsPlanInspect.setIsFlag("1");
dmsPlanInspect.setCreateTime(DateUtils.getNowDate());
@ -97,7 +98,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService
@Override
public int updateDmsPlanInspect(DmsPlanInspect dmsPlanInspect)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsPlanInspect.setUpdateBy(user.getUsername());
dmsPlanInspect.setUpdateTime(DateUtils.getNowDate());
return dmsPlanInspectMapper.updateDmsPlanInspect(dmsPlanInspect);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java
Unescape Escape View File

@ -97,4 +97,9 @@ public class DmsPlanLubeDetailServiceImpl implements IDmsPlanLubeDetailService
{
return dmsPlanLubeDetailMapper.deleteDmsPlanLubeDetailByPlanLubeDetailId(planLubeDetailId);
}
@Override
public List<DmsPlanLubeDetail> selectPlanLubeDetailByPlanLubeId(Long planLubeId) {
return dmsPlanLubeDetailMapper.selectPlanLubeDetailByPlanLubeId(planLubeId);
}
}

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java
Unescape Escape View File

@ -113,4 +113,9 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService
{
return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailJoinList(dmsPlanMaintDetail);
}
@Override
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId) {
return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailListByPlanMaintId(planMaintId);
}
}

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java
Unescape Escape View File

@ -208,12 +208,13 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService {
public void insertDmsPlanMaintDetail(DmsPlanMaint dmsPlanMaint) {
List<DmsPlanMaintDetail> dmsPlanMaintDetailList = dmsPlanMaint.getDmsPlanMaintDetailList();
Long planMaintId = dmsPlanMaint.getPlanMaintId();
LoginUser user = new LoginUser();
LoginUser loginUser = SecurityUtils.getLoginUser();
if (StringUtils.isNotNull(dmsPlanMaintDetailList)) {
List<DmsPlanMaintDetail> list = new ArrayList<DmsPlanMaintDetail>();
for (DmsPlanMaintDetail dmsPlanMaintDetail : dmsPlanMaintDetailList) {
dmsPlanMaintDetail.setIsFlag(1l);
dmsPlanMaintDetail.setCreateBy(user.getUsername());
dmsPlanMaintDetail.setCreateBy(loginUser.getUsername());
dmsPlanMaintDetail.setPlanMaintId(planMaintId);
list.add(dmsPlanMaintDetail);
}

21
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairDetailServiceImpl.java
Unescape Escape View File

@ -10,19 +10,19 @@ import com.hw.dms.service.IDmsPlanRepairDetailService;
/**
* 检修计划明细Service业务层处理
*
*
* @author Open Platform
* @date 2024-01-15
*/
@Service
public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailService
public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailService
{
@Autowired
private DmsPlanRepairDetailMapper dmsPlanRepairDetailMapper;
/**
* 查询检修计划明细
*
*
* @param planRepairDetailId 检修计划明细主键
* @return 检修计划明细
*/
@ -34,7 +34,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi
/**
* 查询检修计划明细列表
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 检修计划明细
*/
@ -46,7 +46,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi
/**
* 新增检修计划明细
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 结果
*/
@ -59,7 +59,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi
/**
* 修改检修计划明细
*
*
* @param dmsPlanRepairDetail 检修计划明细
* @return 结果
*/
@ -72,7 +72,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi
/**
* 批量删除检修计划明细
*
*
* @param planRepairDetailIds 需要删除的检修计划明细主键
* @return 结果
*/
@ -84,7 +84,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi
/**
* 删除检修计划明细信息
*
*
* @param planRepairDetailId 检修计划明细主键
* @return 结果
*/
@ -93,4 +93,9 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi
{
return dmsPlanRepairDetailMapper.deleteDmsPlanRepairDetailByPlanRepairDetailId(planRepairDetailId);
}
@Override
public List<DmsPlanRepairDetail> selectPlanRepairDetailByPlanRepairId(Long planRepairId) {
return dmsPlanRepairDetailMapper.selectPlanRepairDetailByPlanRepairId(planRepairId);
}
}

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordInspectServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService
@Override
public int insertDmsRecordInspect(DmsRecordInspect dmsRecordInspect)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordInspect.setIsFlag("1");
dmsRecordInspect.setCreateBy(user.getUsername());
dmsRecordInspect.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService
@Override
public int updateDmsRecordInspect(DmsRecordInspect dmsRecordInspect)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordInspect.setUpdateBy(user.getUsername());
dmsRecordInspect.setUpdateTime(DateUtils.getNowDate());
return dmsRecordInspectMapper.updateDmsRecordInspect(dmsRecordInspect);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordLubeServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService
@Override
public int insertDmsRecordLube(DmsRecordLube dmsRecordLube)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordLube.setCreateBy(user.getUsername());
dmsRecordLube.setCreateTime(DateUtils.getNowDate());
dmsRecordLube.setIsFlag("1");
@ -70,7 +71,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService
@Override
public int updateDmsRecordLube(DmsRecordLube dmsRecordLube)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordLube.setUpdateBy(user.getUsername());
dmsRecordLube.setUpdateTime(DateUtils.getNowDate());
return dmsRecordLubeMapper.updateDmsRecordLube(dmsRecordLube);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
@Override
public int insertDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordShutDown.setIsFlag(1l);
dmsRecordShutDown.setCreateBy(user.getUsername());
dmsRecordShutDown.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
@Override
public int updateDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordShutDown.setUpdateBy(user.getUsername());
dmsRecordShutDown.setUpdateTime(DateUtils.getNowDate());
return dmsRecordShutDownMapper.updateDmsRecordShutDown(dmsRecordShutDown);

5
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java
Unescape Escape View File

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsPlanRepair;
import com.hw.dms.domain.DmsRepairInstance;
import com.hw.dms.mapper.DmsPlanRepairMapper;
@ -67,7 +68,7 @@ public class DmsRepairInstanceActivityServiceImpl implements IDmsRepairInstanceA
public int insertDmsRepairInstanceActivity(DmsRepairInstanceActivity dmsRepairInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRepairInstanceActivity.setCreateTime(DateUtils.getNowDate());
dmsRepairInstanceActivity.setCreateBy(user.getUsername());
dmsRepairInstanceActivity.setStartTime(DateUtils.getNowDate());
@ -131,7 +132,7 @@ public class DmsRepairInstanceActivityServiceImpl implements IDmsRepairInstanceA
@Override
public int updateDmsRepairInstanceActivity(DmsRepairInstanceActivity dmsRepairInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
//第一步
if (dmsRepairInstanceActivity.getProcessStepOrder()==1){
dmsRepairInstanceActivity.setProcessHandleStatus("2");

3
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java
Unescape Escape View File

@ -7,6 +7,7 @@ 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.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsPlanRepair;
import com.hw.dms.domain.DmsRepairInstanceActivity;
import com.hw.dms.mapper.DmsPlanRepairMapper;
@ -101,7 +102,7 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService
String dailyCode = format + serialNumberStr;
dmsRepairInstance.setBillsRepairCode(dailyCode);
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
if (dmsRepairInstance.getPlanBeginTime()!=null){
DmsPlanRepair dmsPlanRepair = dmsPlanRepairMapper.selectDmsPlanRepairByPlanRepairId(dmsRepairInstance.getPlanRepairId());
Long timeLimit = dmsPlanRepair.getTimeLimit();

39
hw-modules/hw-dms/src/main/resources/mapper/dms/BaseAttachInfoMapper.xml
Unescape Escape View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.BaseAttachInfoMapper">
<resultMap type="BaseAttachInfo" id="BaseAttachInfoResult">
<result property="attachId" column="attach_id"/>
<result property="attachCode" column="attach_code"/>
<result property="attachName" column="attach_name"/>
<result property="attachType" column="attach_type"/>
<result property="attachPath" column="attach_path"/>
<result property="processId" column="process_id"/>
<result property="activeFlag" column="active_flag"/>
<result property="remark" column="remark"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<insert id="batchDmsKnowLedgeLubeFile" >
insert into mes_base_attach_info( attach_type, attach_name, attach_path, process_id) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.attachType}, #{item.attachName}, #{item.attachPath}, #{item.processId})
</foreach>
</insert>
<select id="selectListBaseAttachInfos" >
select attach_path
from mes_base_attach_info
where attach_type = #{attachType} and process_id = #{processId}
</select>
<delete id="deleteListBaseAttachInfos" >
delete from mes_base_attach_info
where attach_type = #{attachType} and process_id = #{processId}
</delete>
</mapper>

4
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceInstallMapper.xml
Unescape Escape View File

@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join dms_base_device_ledger b on a.device_id = b.device_id
<where>
<if test="deviceId != null "> and a.device_id = #{deviceId}</if>
<if test="installPosition != null and installPosition != ''"> and a.install_position = #{installPosition}</if>
<if test="installTime != null "> and a.install_time = #{installTime}</if>
<if test="installPosition != null and installPosition != ''"> and a.install_position like concat( '%',#{installPosition},'%')</if>
<if test="params.beginTime != null and params.endTime !=null"> and a.install_time between #{params.beginTime} and #{params.endTime}</if>
<if test="installPersion != null and installPersion != ''"> and a.install_persion = #{installPersion}</if>
<if test="workOrder != null and workOrder != ''"> and a.work_order = #{workOrder}</if>
<if test="deviceName != null and deviceName != ''"> and b.device_name like concat('%', #{deviceName},'%')</if>

14
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml
Unescape Escape View File

@ -28,13 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from dms_base_specialdevice_param a
left join dms_base_device_ledger b on a.device_id = b.device_id
<where>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceName != null "> and device_name like concat('%', #{deviceName},'%')</if>
<if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
<if test="paramName != null and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
<if test="paramValue != null and paramValue != ''"> and param_value = #{paramValue}</if>
<if test="paramUnit != null and paramUnit != ''"> and param_unit = #{paramUnit}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
<if test="deviceId != null "> and a.device_id = #{deviceId}</if>
<if test="deviceName != null "> and b.device_name like concat('%', #{deviceName},'%')</if>
<if test="paramCode != null and paramCode != ''"> and a.param_code = #{paramCode}</if>
<if test="paramName != null and paramName != ''"> and a.param_name like concat('%', #{paramName}, '%')</if>
<if test="paramValue != null and paramValue != ''"> and a.param_value = #{paramValue}</if>
<if test="paramUnit != null and paramUnit != ''"> and a.param_unit = #{paramUnit}</if>
<if test="isFlag != null "> and a.is_flag = #{isFlag}</if>
</where>
</select>

6
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseTransferInfoMapper.xml
Unescape Escape View File

@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join dms_base_device_ledger b on a.device_id = b.device_id
<where>
<if test="deviceId != null "> and a.device_id = #{deviceId}</if>
<if test="devicePosition != null and devicePosition != ''"> and a.device_position = #{devicePosition}</if>
<if test="devicePositionNew != null and devicePositionNew != ''"> and a.device_position_new = #{devicePositionNew}</if>
<if test="devicePosition != null and devicePosition != ''"> and a.device_position like concat('%',#{devicePosition},'%') </if>
<if test="devicePositionNew != null and devicePositionNew != ''"> and a.device_position_new like concat('%',#{devicePositionNew},'%') </if>
<if test="devicePositionOperator != null and devicePositionOperator != ''"> and a.device_position_operator = #{devicePositionOperator}</if>
<if test="devicePositionReason != null and devicePositionReason != ''"> and a.device_position_reason = #{devicePositionReason}</if>
<if test="deviceTransferTime != null "> and a.device_transfer_time = #{deviceTransferTime}</if>
<if test="params.beginTime != null and params.endTime !=null"> and a.device_transfer_time between #{params.beginTime} and #{params.endTime}</if>
<if test="deviceName != null "> and b.device_name like concat('%', #{deviceName},'%')</if>
</where>
</select>

2
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml
Unescape Escape View File

@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserIdByDmsBillsInspectInstanceActivityId" parameterType="Long" resultType="java.lang.Long">
select auth_target_id from wf_process_activity_auth where process_activity_id =(
select process_activity_id from wf_process_activity
where wf_process_id = 106
where wf_process_id = 105
and process_activity_order = (1+(select max(process_step_order)
from dms_bills_inspect_instance_activity
where inspect_instance_id=#{instanceActivityId})))

10
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
Unescape Escape View File

@ -32,15 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsBillsInspectInstanceList" parameterType="DmsBillsInspectInstance" resultMap="DmsBillsInspectInstanceResult">
<include refid="selectDmsBillsInspectInstanceVo"/>
<where>
<if test="planInspectId != null "> and plan_inspect_id = #{planInspectId}</if>
<if test="planInspectId != null "> and plan_inspect_id like concat('%',#{planInspectId},'%') </if>
<if test="inspectInstanceId != null "> and inspect_instance_id = #{inspectInstanceId}</if>
<if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
<if test="inspectType != null and inspectType != ''"> and inspect_type = #{inspectType}</if>
<if test="billsInspectCode != null and billsInspectCode != ''"> and bills_inspect_code = #{billsInspectCode}</if>
<if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
<if test="planEndTime != null "> and plan_end_time = #{planEndTime}</if>
<if test="realBeginTime != null "> and real_begin_time = #{realBeginTime}</if>
<if test="realEndTime != null "> and real_end_time = #{realEndTime}</if>
<if test="planBeginTime != null "> and plan_begin_time > #{planBeginTime}</if>
<if test="planEndTime != null "> and #{planEndTime}>plan_end_time </if>
<if test="realBeginTime != null "> and real_begin_time > #{realBeginTime}</if>
<if test="realEndTime != null "> and #{realEndTime}>real_end_time</if>
<if test="inspectStatus != null and inspectStatus != ''"> and inspect_status = #{inspectStatus}</if>
<if test="isFlag != null and isFlag != ''"> and is_flag = #{isFlag}</if>
</where>

1
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsLubeInstanceMapper.xml
Unescape Escape View File

@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDmsBillsLubeInstanceVo"/>
<where>
<if test="planLubeId != null "> and plan_lube_id = #{planLubeId}</if>
<if test="lubeInstanceId != null "> and lube_instance_id = #{lubeInstanceId}</if>
<if test="billsLubeCode != null and billsLubeCode != ''"> and bills_lube_code = #{billsLubeCode}</if>
<if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
<if test="realBeginTime != null "> and real_begin_time = #{realBeginTime}</if>

11
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
Unescape Escape View File

@ -36,12 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDmsBillsMaintInstanceVo"/>
<where>
<if test="planMaintId != null "> and plan_maint_id = #{planMaintId}</if>
<if test="maintInstanceId != null "> and maint_instance_id = #{maintInstanceId}</if>
<if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
<if test="billsMaintCode != null and billsMaintCode != ''"> and bills_maint_code = #{billsMaintCode}</if>
<if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
<if test="realBeginTime != null "> and real_begin_time = #{realBeginTime}</if>
<if test="planEndTime != null "> and plan_end_time = #{planEndTime}</if>
<if test="realEndTime != null "> and real_end_time = #{realEndTime}</if>
<if test="billsMaintCode != null and billsMaintCode != ''"> and bills_maint_code like concat('%',#{billsMaintCode},'%') </if>
<if test="planBeginTime != null "> and plan_begin_time > #{planBeginTime}</if>
<if test="planEndTime != null "> and #{planEndTime}>plan_end_time</if>
<if test="realBeginTime != null "> and real_begin_time > #{realBeginTime}</if>
<if test="realEndTime != null "> and #{realEndTime} > real_end_time</if>
<if test="maintStatus != null "> and maint_status = #{maintStatus}</if>
<if test="maintCompRate != null "> and maint_comp_rate = #{maintCompRate}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>

6
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailProjectMapper.xml
Unescape Escape View File

@ -146,4 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectDmsInspectInstanceDetailProjectByInspectInstanceId" parameterType="Long" resultMap="DmsInspectInstanceDetailProjectResult">
select instance_detail_project_id, instance_detail_id, inspect_project_id, inspect_project_status, inspect_project_result, project_step_order, def_value, inspect_project_name, inspect_project_property, up_limit, low_limit, create_by, create_time, update_by, update_time from dms_inspect_instance_detail_project
where instance_detail_id =(
select instance_detail_id from dms_inspect_instance_detail where inspect_instance_id = #{inspectInstanceId} and line_step = #{lineStep})
</select>
</mapper>

23
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml
Unescape Escape View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsInspectRouteDetailMapper">
<resultMap type="DmsInspectRouteDetail" id="DmsInspectRouteDetailResult">
<result property="routeDetailId" column="route_detail_id" />
<result property="inspectRouteId" column="inspect_route_id" />
@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inspectStandard" column="inspect_standard" />
<result property="isFlag" column="is_flag" />
<result property="remark" column="remark" />
<result property="deviceName" column="device_name" />
<result property="standardName" column="standard_name" />
</resultMap>
<sql id="selectDmsInspectRouteDetailVo">
@ -20,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsInspectRouteDetailList" parameterType="DmsInspectRouteDetail" resultMap="DmsInspectRouteDetailResult">
<include refid="selectDmsInspectRouteDetailVo"/>
<where>
<where>
<if test="inspectRouteId != null "> and inspect_route_id = #{inspectRouteId}</if>
<if test="lineStep != null "> and line_step = #{lineStep}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
@ -28,12 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isFlag != null and isFlag != ''"> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsInspectRouteDetailByRouteDetailId" parameterType="Long" resultMap="DmsInspectRouteDetailResult">
<include refid="selectDmsInspectRouteDetailVo"/>
where route_detail_id = #{routeDetailId}
</select>
<insert id="insertDmsInspectRouteDetail" parameterType="DmsInspectRouteDetail" useGeneratedKeys="true" keyProperty="routeDetailId">
insert into dms_inspect_route_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -72,9 +74,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDmsInspectRouteDetailByRouteDetailIds" parameterType="String">
delete from dms_inspect_route_detail where route_detail_id in
delete from dms_inspect_route_detail where route_detail_id in
<foreach item="routeDetailId" collection="array" open="(" separator="," close=")">
#{routeDetailId}
</foreach>
</delete>
</mapper>
<select id="selectInspectRouteListByInspectRouteId" parameterType="Long" resultMap="DmsInspectRouteDetailResult">
select a.route_detail_id, a.inspect_route_id, a.line_step, a.device_id, a.inspect_standard,
a.is_flag, a.remark,b.device_name,c.standard_name
from dms_inspect_route_detail a
left join dms_base_device_ledger b on a.device_id = b.device_id
left join dms_base_inspect_standard c on a.inspect_standard = c.inspect_standard_id
where a.inspect_route_id = #{inspectRouteId}
</select>
</mapper>

3
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml
Unescape Escape View File

@ -73,4 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( #{item.instanceFileId}, #{item.targetType}, #{item.targetId}, #{item.filePath})
</foreach>
</insert>
<delete id="deleteDmsInstanceFileByUpdate">
delete from dms_instance_file where target_type = 1 and target_id =#{targetId}
</delete>
</mapper>

24
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeDetailMapper.xml
Unescape Escape View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsPlanLubeDetailMapper">
<resultMap type="DmsPlanLubeDetail" id="DmsPlanLubeDetailResult">
<result property="planLubeDetailId" column="plan_lube_detail_id" />
<result property="planLubeId" column="plan_lube_id" />
@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="deviceName" column="device_name" />
<result property="lubeStationName" column="lube_station_name" />
<result property="lubeStandardCode" column="lube_standard_code" />
</resultMap>
<sql id="selectDmsPlanLubeDetailVo">
@ -25,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsPlanLubeDetailList" parameterType="DmsPlanLubeDetail" resultMap="DmsPlanLubeDetailResult">
<include refid="selectDmsPlanLubeDetailVo"/>
<where>
<where>
<if test="planLubeId != null "> and plan_lube_id = #{planLubeId}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="lubeStationId != null "> and lube_station_id = #{lubeStationId}</if>
@ -34,12 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsPlanLubeDetailByPlanLubeDetailId" parameterType="Long" resultMap="DmsPlanLubeDetailResult">
<include refid="selectDmsPlanLubeDetailVo"/>
where plan_lube_detail_id = #{planLubeDetailId}
</select>
<insert id="insertDmsPlanLubeDetail" parameterType="DmsPlanLubeDetail" useGeneratedKeys="true" keyProperty="planLubeDetailId">
insert into dms_plan_lube_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -93,9 +96,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDmsPlanLubeDetailByPlanLubeDetailIds" parameterType="String">
delete from dms_plan_lube_detail where plan_lube_detail_id in
delete from dms_plan_lube_detail where plan_lube_detail_id in
<foreach item="planLubeDetailId" collection="array" open="(" separator="," close=")">
#{planLubeDetailId}
</foreach>
</delete>
</mapper>
<select id="selectPlanLubeDetailByPlanLubeId" parameterType="Long" resultMap="DmsPlanLubeDetailResult">
select a.plan_lube_detail_id, a.plan_lube_id, a.device_id, a.lube_station_id,
a.lube_standard_id, a.operation_description,b.device_name,c.lube_station_name,d.lube_standard_code
from dms_plan_lube_detail a
left join dms_base_device_ledger b on a.device_id = b.device_id
left join dms_base_lube_station c on b.device_type_id = c.device_type_id
left join dms_base_lube_standard d on d.lube_standard_id = a.lube_standard_id
where plan_lube_id = #{planLubeId}
</select>
</mapper>

11
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml
Unescape Escape View File

@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="maintProtocol" column="maint_protocol" />
<result property="maintStationName" column="maint_station_name" />
<result property="maintStationCode" column="maint_station_code" />
<result property="deviceName" column="device_name" />
</resultMap>
<sql id="selectDmsPlanMaintDetailVo">
@ -132,5 +134,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsPlanMaintDetailListByPlanMaintId" parameterType="Long" resultMap="DmsPlanMaintDetailResult">
select a.plan_maint_detail_id, a.plan_maint_id, a.device_id, a.maint_station_id,
a.maint_standard_id, a.operation_description,b.device_name,c.maint_station_name,d.maint_protocol
from dms_plan_maint_detail a
left join dms_base_device_ledger b on a.device_id = b.device_id
left join dms_base_maint_station c on b.device_type_id = c.device_type_id
left join dms_base_maint_standard d on a.maint_station_id = d.maint_standard_id
where a.plan_maint_id = #{planMaintId}
</select>
</mapper>

38
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairDetailMapper.xml
Unescape Escape View File

@ -3,11 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsPlanRepairDetailMapper">
<resultMap type="DmsPlanRepairDetail" id="DmsPlanRepairDetailResult">
<result property="planRepairDetailId" column="plan_repair_detail_id" />
<result property="planRepairId" column="plan_repair_id" />
<result property="deviceId" column="device_id" />
<result property="repairDetailTargetType" column="repair_detail_target_type" />
<result property="repairDetailTargetId" column="repair_detail_target_id" />
<result property="faultType" column="fault_type" />
<result property="repairDesc" column="repair_desc" />
<result property="repairProtocol" column="repair_protocol" />
@ -16,35 +17,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="deviceName" column="device_name" />
<result property="planRepairCode" column="plan_repair_code" />
</resultMap>
<sql id="selectDmsPlanRepairDetailVo">
select plan_repair_detail_id, plan_repair_id, device_id, fault_type, repair_desc, repair_protocol, operation_description, create_by, create_time, update_by, update_time from dms_plan_repair_detail
select plan_repair_detail_id, plan_repair_id, repair_detail_target_type, repair_detail_target_id , fault_type, repair_desc, repair_protocol, operation_description, create_by, create_time, update_by, update_time from dms_plan_repair_detail
</sql>
<select id="selectDmsPlanRepairDetailList" parameterType="DmsPlanRepairDetail" resultMap="DmsPlanRepairDetailResult">
<include refid="selectDmsPlanRepairDetailVo"/>
<where>
<where>
<if test="planRepairId != null "> and plan_repair_id = #{planRepairId}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="faultType != null and faultType != ''"> and fault_type = #{faultType}</if>
<if test="repairDesc != null and repairDesc != ''"> and repair_desc = #{repairDesc}</if>
<if test="repairProtocol != null and repairProtocol != ''"> and repair_protocol = #{repairProtocol}</if>
<if test="operationDescription != null and operationDescription != ''"> and operation_description = #{operationDescription}</if>
</where>
</select>
<select id="selectDmsPlanRepairDetailByPlanRepairDetailId" parameterType="Long" resultMap="DmsPlanRepairDetailResult">
<include refid="selectDmsPlanRepairDetailVo"/>
where plan_repair_detail_id = #{planRepairDetailId}
</select>
<insert id="insertDmsPlanRepairDetail" parameterType="DmsPlanRepairDetail" useGeneratedKeys="true" keyProperty="planRepairDetailId">
insert into dms_plan_repair_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="planRepairId != null">plan_repair_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="faultType != null">fault_type,</if>
<if test="repairDetailTargetType != null">repair_detail_target_type,</if>
<if test="repairDetailTargetId != null">repair_detail_target_id,</if>
<if test="repairDesc != null">repair_desc,</if>
<if test="repairProtocol != null">repair_protocol,</if>
<if test="operationDescription != null">operation_description,</if>
@ -55,8 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="planRepairId != null">#{planRepairId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="faultType != null">#{faultType},</if>
<if test="repairDetailTargetType != null">#{repairDetailTargetType},</if>
<if test="repairDetailTargetId != null">#{repairDetailTargetId},</if>
<if test="repairDesc != null">#{repairDesc},</if>
<if test="repairProtocol != null">#{repairProtocol},</if>
<if test="operationDescription != null">#{operationDescription},</if>
@ -71,8 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update dms_plan_repair_detail
<trim prefix="SET" suffixOverrides=",">
<if test="planRepairId != null">plan_repair_id = #{planRepairId},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="faultType != null">fault_type = #{faultType},</if>
<if test="repairDetailTargetType != null">repair_detail_target_type = #{repairDetailTargetType},</if>
<if test="repairDetailTargetId != null">repair_detail_target_id = #{repairDetailTargetId},</if>
<if test="repairDesc != null">repair_desc = #{repairDesc},</if>
<if test="repairProtocol != null">repair_protocol = #{repairProtocol},</if>
<if test="operationDescription != null">operation_description = #{operationDescription},</if>
@ -89,9 +94,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDmsPlanRepairDetailByPlanRepairDetailIds" parameterType="String">
delete from dms_plan_repair_detail where plan_repair_detail_id in
delete from dms_plan_repair_detail where plan_repair_detail_id in
<foreach item="planRepairDetailId" collection="array" open="(" separator="," close=")">
#{planRepairDetailId}
</foreach>
</delete>
</mapper>
<select id="selectPlanRepairDetailByPlanRepairId" parameterType="Long" resultMap="DmsPlanRepairDetailResult">
select a.plan_repair_detail_id, a.plan_repair_id, a.repair_detail_target_type,
a.repair_detail_target_id , a.fault_type,a.repair_desc, a.repair_protocol,
a.operation_description,b.device_name,c.plan_repair_code
from dms_plan_repair_detail a
left join dms_base_device_ledger b on a.repair_detail_target_id = b.device_id
left join dms_plan_repair c on c.plan_repair_id = a.plan_repair_id
where a.plan_repair_id = #{planReapirId}
</select>
</mapper>

5
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml
Unescape Escape View File

@ -31,7 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="DmsPlanRepairDetail" id="DmsPlanRepairDetailResult">
<result property="planRepairDetailId" column="sub_plan_repair_detail_id" />
<result property="planRepairId" column="sub_plan_repair_id" />
<result property="deviceId" column="sub_device_id" />
<result property="repairDetailTargetType" column="repair_detail_target_type" />
<result property="repairDetailTargetId" column="repair_detail_target_id" />
<result property="faultType" column="sub_fault_type" />
<result property="repairDesc" column="sub_repair_desc" />
<result property="repairProtocol" column="sub_repair_protocol" />
@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsPlanRepairByPlanRepairId" parameterType="Long" resultMap="DmsPlanRepairDmsPlanRepairDetailResult">
select a.plan_repair_id, a.plan_repair_code, a.repair_type, a.repair_group, a.repair_supervisor, a.repair_time, a.cycle_period, a.create_method, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time,a.time_limit,
b.plan_repair_detail_id as sub_plan_repair_detail_id, b.plan_repair_id as sub_plan_repair_id, b.repair_detail_target_type as sub_repair_detail_target_type,b.repair_detail_target_id as sub_device_id, b.fault_type as sub_fault_type, b.repair_desc as sub_repair_desc, b.repair_protocol as sub_repair_protocol, b.operation_description as sub_operation_description, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time
b.plan_repair_detail_id as sub_plan_repair_detail_id, b.plan_repair_id as sub_plan_repair_id, b.repair_detail_target_type as sub_repair_detail_target_type,b.repair_detail_target_id as repair_detail_target_id, b.fault_type as sub_fault_type, b.repair_desc as sub_repair_desc, b.repair_protocol as sub_repair_protocol, b.operation_description as sub_operation_description, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time
from dms_plan_repair a
left join dms_plan_repair_detail b on b.plan_repair_id = a.plan_repair_id
where a.plan_repair_id = #{planRepairId}

125
hw-modules/hw-jindie/src/main/java/com/hw/jindie/config/KingdeeConfig.java
Unescape Escape View File

@ -0,0 +1,125 @@
package com.hw.jindie.config;
import com.alibaba.fastjson2.JSONObject;
import com.hw.common.core.utils.DateUtils;
import com.kingdee.bos.webapi.sdk.K3CloudApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* 金蝶 bean配置
*/
@Configuration
public class KingdeeConfig {
@Bean
public K3CloudApi K3CloudApi() {
return new K3CloudApi();
}
/**
* 实体主键
*/
public static Long FID = 0L;
/**
* 申请日期
*/
public static String FApplicationDate = DateUtils.getTime();
/**
* 申请类型
*/
public static String FRequestType = "Material";
/**
* 采购申请单formId
*/
public static String PUR_Requisition = "PUR_Requisition";
/**
* 采购入库单formId
*/
public static String STK_InStock = "STK_InStock";
/**
* 京源项目
*/
public static JSONObject F_TOND_Base = new JSONObject();
/**
* 申请组织||需求组织||采购组织
*/
public static JSONObject FApplicationOrgId = new JSONObject();
/**
* 单据类型-单一采购申请单
*/
public static JSONObject FBillTypeIDPurchase = new JSONObject();
/**
* 单据类型-采购入库单
*/
public static JSONObject FBillTypeIDStorage = new JSONObject();
/**
* 币别
*/
public static JSONObject FCurrencyId = new JSONObject();
/**
* 汇率类型
*/
public static JSONObject FExchangeTypeId = new JSONObject();
/**
* 京源项目
*/
public static JSONObject getF_TOND_Base() {
F_TOND_Base.put("FNumber", "001");
return F_TOND_Base;
}
/**
* 申请组织||需求组织||采购组织
*/
public static JSONObject getFApplicationOrgId() {
FApplicationOrgId.put("FNumber", "100");
return FApplicationOrgId;
}
/**
* 单据类型-单一采购申请单
*/
public static JSONObject getFBillTypeIDPurchase() {
FBillTypeIDPurchase.put("FNUMBER", "CGSQD01_SYS");
return FBillTypeIDPurchase;
}
/**
* 单据类型-采购入库单
*/
public static JSONObject getFBillTypeIDStorage() {
FBillTypeIDStorage.put("FNUMBER", "RKD01_SYS");
return FBillTypeIDStorage;
}
/**
* 币别
*/
public static JSONObject getFCurrencyId() {
FCurrencyId.put("FNumber", "PRE001");
return FCurrencyId;
}
/**
* 汇率类型
*/
public static JSONObject getFExchangeTypeId() {
FExchangeTypeId.put("FNumber", "HLTX01_SYS");
return FExchangeTypeId;
}
}

121
hw-modules/hw-jindie/src/main/java/com/hw/jindie/controller/KingdeeErpSyncController.java
Unescape Escape View File

@ -1,11 +1,12 @@
package com.hw.jindie.controller;
import com.alibaba.fastjson2.JSONObject;
import com.hw.common.core.web.domain.AjaxResult;
import com.hw.common.log.annotation.Log;
import com.hw.common.log.enums.BusinessType;
import com.hw.jindie.service.IKingdeeErpSyncService;
import com.hw.jindie.service.impl.KingdeeErpService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
@ -18,9 +19,13 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/jindie")
public class KingdeeErpSyncController {
@Autowired
private IKingdeeErpSyncService kingdeeErpSyncService;
@Autowired
private KingdeeErpService kingdeeErpService;
/**
* 新增原材料入库记录
*/
@ -28,12 +33,122 @@ public class KingdeeErpSyncController {
@Log(title = "物料信息", businessType = BusinessType.INSERT)
@GetMapping(("/syncMaterialInfo"))
public AjaxResult syncMaterialInfo() {
try{
try {
return AjaxResult.success(kingdeeErpSyncService.syncMaterialInfoFromErp());
}catch(Exception e){
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.error();
}
}
/**
* 单一采购申请单保存->提交->审核
*
* @param params {"FMaterialId": "040200050162","FMaterialDesc": "UPVC直管","FReqQty": 20}
* @return {"msg": "{"IsSuccess": true,"Errors": [],"SuccessEntitys": [{"Id": "154898","Number": "CGSQ010785","DIndex": 0}]}", "code": 200}
*/
@PostMapping(("/singleSavePurchaseRequisition"))
public AjaxResult singleSavePurchaseRequisition(@RequestBody String params) {
try {
return AjaxResult.success(kingdeeErpService.singleSavePurchaseRequisition(params));
} catch (Exception e) {
return AjaxResult.error(e.toString());
}
}
/**
* 采购入库单保存->提交->审核
*
* @param params {"FMaterialId": "02030002","FMaterialDesc": "推进式搅拌机",
* "FAuxPropId": "①【搅拌机】380V--BLD12搅拌机功率3kw，速比23（转速65rpm） ②【搅拌杆】搅拌杆长度3200mm，轴径57 ③【叶轮】叶轮直径650，二叶双层 ④【材质】碳钢衬胶⑤【机架】TJA2机架特别备注：①湘潭电机二级能效；②衬胶材质③电压:三相380V/50Hz; 电机防护/绝缘/温升:IP56/F/B",
* "FUnitID": "tai","FStockId": "CK002","FSrcBillNo": "JYCG-2023-5184","FRealQty": 4.0000,"FDate": "2024-04-10 00:00:00"}
* @return {"msg": "{"IsSuccess":true,"Errors":[],"SuccessEntitys":[{"Id":"106249","Number":"CGRK00779","DIndex":0}]}","code": 200
* }
*/
@PostMapping(("/savePurchaseStorage"))
public AjaxResult savePurchaseStorage(@RequestBody String params) {
try {
return AjaxResult.success(kingdeeErpService.savePurchaseStorage(params));
} catch (Exception e) {
return AjaxResult.error(e.toString());
}
}
/**
* ERP通用保存接口
*
* @param params
* @param formId
* @return
*/
@PostMapping(("/genericSaveInterface/{formId}"))
public String genericSaveInterface(@RequestBody JSONObject params, @PathVariable("formId") String formId) {
try {
return kingdeeErpService.genericSaveInterface(params, formId);
} catch (Exception e) {
return e.toString();
}
}
/**
* ERP通用提交接口
*
* @param params
* @return
*/
@PostMapping(("/genericCommitInterface"))
public AjaxResult genericCommitInterface(@RequestBody JSONObject params) {
try {
return AjaxResult.success(kingdeeErpService.genericCommitInterface(params));
} catch (Exception e) {
return AjaxResult.error(e.toString());
}
}
/**
* ERP通用审核接口
*
* @param params
* @return
*/
@PostMapping(("/genericAuditInterface"))
public AjaxResult genericAuditInterface(@RequestBody JSONObject params) {
try {
return AjaxResult.success(kingdeeErpService.genericAuditInterface(params));
} catch (Exception e) {
return AjaxResult.error(e.toString());
}
}
/**
* ERP通用查看接口
*
* @param params
* @return
*/
@PostMapping(("/genericViewInterface"))
public String genericViewInterface(@RequestBody JSONObject params) {
try {
return kingdeeErpService.genericViewInterface(params);
} catch (Exception e) {
return e.toString();
}
}
/**
* 测试组装实体
*
* @param params
* @return
*/
@PostMapping(("/testAssemblyEntity"))
public String testAssemblyEntity(@RequestBody String params) {
try {
return kingdeeErpService.testAssemblyEntity(params);
} catch (Exception e) {
return e.toString();
}
}
}

372
hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java
Unescape Escape View File

@ -0,0 +1,372 @@
package com.hw.jindie.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.hw.common.core.utils.StringUtils;
import com.hw.jindie.config.KingdeeConfig;
import com.kingdee.bos.webapi.entity.RepoRet;
import com.kingdee.bos.webapi.entity.RepoStatus;
import com.kingdee.bos.webapi.sdk.K3CloudApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
/**
* @Description: 金蝶ERP交互业务处理类
* @Author : Yinq
* @Date :2024-04-08 14:38
*/
@Service
public class KingdeeErpService {
private static final Logger logger = LoggerFactory.getLogger(KingdeeErpService.class);
private final K3CloudApi client;
public KingdeeErpService(K3CloudApi client) {
this.client = client;
}
/**
* 单一采购申请单保存->提交->审核
*
* @param params
* @return
*/
public String singleSavePurchaseRequisition(String params) {
Gson gsonParams = new Gson();
JSONObject objectParams = gsonParams.fromJson(params, JSONObject.class);
JSONObject model = new JSONObject();
JSONObject FEntity = new JSONObject();
String FMaterialId = (String) objectParams.get("FMaterialId");//物料编码
String FUnitId = (String) objectParams.get("FUnitId");//单位
// String FMaterialDesc = (String) objectParams.get("FMaterialDesc");//物料说明
Double FReqQty = (Double) objectParams.get("FReqQty");//采购数量
try {
//业务对象标识
String formId = KingdeeConfig.PUR_Requisition;
//调用接口
FEntity.put("FRequireOrgId", KingdeeConfig.getFApplicationOrgId()); //需求组织(必填项)
JSONObject FMaterialIdObject = new JSONObject();
FMaterialIdObject.put("FNumber", FMaterialId);
FEntity.put("FMaterialId", FMaterialIdObject); //物料编码(必填项)
FEntity.put("FPurchaseOrgId", KingdeeConfig.getFApplicationOrgId()); //采购组织(必填项)
JSONObject FUnitIdObject = new JSONObject();
FUnitIdObject.put("FNumber", FUnitId);
FEntity.put("FUnitId", FUnitIdObject); //申请单位(必填项)
FEntity.put("FPriceUnitId", FUnitIdObject); //计价单位(必填项)
FEntity.put("FREQSTOCKUNITID", FUnitIdObject); //库存单位(必填项)
FEntity.put("FReqQty", FReqQty); //申请数量
// FEntity.put("FMaterialDesc", FMaterialDesc); //物料说明
// FEntity.put("FReceiveOrgId", KingdeeConfig.getFApplicationOrgId()); //收料组织
// FEntity.put("FApproveQty", FReqQty); //批准数量
// FEntity.put("FEvaluatePrice", 0.0); //单价
// FEntity.put("FTAXPRICE", 0.0); //含税单价
// FEntity.put("FTAXRATE", 0.0); //税率%
// FEntity.put("FPriceUnitQty", FReqQty); //计价数量
// FEntity.put("FREQSTOCKQTY", FReqQty); //库存单位数量
// FEntity.put("FLeadTime", 0); //提前期
// FEntity.put("FSrcBillTypeId", ""); //源单类型
// FEntity.put("FSrcBillNo", ""); //源单编号
// FEntity.put("FBaseReqQty", FReqQty); //申请数量
// FEntity.put("FSalUnitID", FUnitId); //销售单位
// FEntity.put("FSalQty", FReqQty); //销售数量
// FEntity.put("FSalBaseQty", FReqQty); //销售基本数量
// FEntity.put("FIsVmiBusiness", false); //VMI业务
// FEntity.put("FDEMANDBILLENTRYSEQ", 0); // 需求单据行号
// FEntity.put("FDEMANDBILLENTRYID", 0); // 需求单据分录内码
ArrayList<JSONObject> entityList = new ArrayList<>();
entityList.add(FEntity);
model.put("FEntity", entityList);
JSONObject data = new JSONObject();
model.put("FID", KingdeeConfig.FID);
model.put("F_TOND_Base", KingdeeConfig.getF_TOND_Base()); //京源项目(必填项)
model.put("FBillTypeID", KingdeeConfig.getFBillTypeIDPurchase()); //单据类型(必填项)
model.put("FApplicationDate", KingdeeConfig.FApplicationDate); //申请日期(必填项)
model.put("FRequestType", KingdeeConfig.FRequestType); //申请类型(必填项)
model.put("FApplicationOrgId", KingdeeConfig.getFApplicationOrgId()); //申请组织(必填项)
data.put("Model", model);
String saveParams = data.toJSONString();
String resultJson = client.save(formId, saveParams);
// String resultJson = "{\"Result\":{\"ResponseStatus\":{\"IsSuccess\":true,\"Errors\":[],\"SuccessEntitys\":[{\"Id\":154903,\"Number\":\"CGSQ010788\",\"DIndex\":0}],\"SuccessMessages\":[],\"MsgCode\":0},\"Id\":154903,\"Number\":\"CGSQ010788\",\"NeedReturnData\":[{}]}}";
//用于记录结果
Gson gson = new Gson();
//对返回结果进行解析和校验
RepoRet repoRet = gson.fromJson(resultJson, RepoRet.class);
logger.info("singleSavePurchaseRequisition接口调用成功|请求参数：" + saveParams + "|返回结果：" + resultJson);
RepoStatus responseStatus = repoRet.getResult().getResponseStatus();
if (responseStatus.isIsSuccess()) {
JSONObject json = new JSONObject();
json.put("formId", KingdeeConfig.PUR_Requisition);
json.put("Ids", repoRet.getResult().getId());
//采购申请单提交
String commitResult = this.genericCommitInterface(json);
RepoRet commitRepoRet = gson.fromJson(commitResult, RepoRet.class);
if (!commitRepoRet.getResult().getResponseStatus().isIsSuccess()) {
logger.error("singleSavePurchaseRequisitionCommitException|请求参数：" + json.toJSONString() + "|返回结果：" + commitRepoRet);
}
//采购申请单审核
String auditResult = this.genericAuditInterface(json);
RepoRet auditRepoRet = gson.fromJson(auditResult, RepoRet.class);
if (!auditRepoRet.getResult().getResponseStatus().isIsSuccess()) {
logger.error("singleSavePurchaseRequisitionAuditException|请求参数：" + json.toJSONString() + "|返回结果：" + commitRepoRet);
}
}
return gson.toJson(responseStatus);
} catch (Exception e) {
logger.error("singleSavePurchaseRequisition|params：" + params + "|Exception：" + e);
return e.getMessage();
}
}
/**
* ERP通用提交接口
*
* @param params
* @return
*/
public String genericCommitInterface(JSONObject params) throws Exception {
JSONObject requestParams = new JSONObject();
//业务对象标识
String formId = params.getString("formId");
requestParams.put("Ids", params.get("Ids"));//单据内码集合
// requestParams.put("Numbers", params.get("Numbers"));//单据编码集合
// requestParams.put("CreateOrgId", 0);
// requestParams.put("IgnoreInterationFlag", "");
// requestParams.put("InterationFlags", "");
// requestParams.put("IsVerifyProcInst", "true");
// requestParams.put("NetworkCtrl", "true");
// requestParams.put("UseBatControlTimes", "false");
// requestParams.put("UseOrgId", 0);
//调用接口
String submit = client.submit(formId, requestParams.toJSONString());
logger.info("genericCommitInterface|formId：" + formId + "|请求参数：" + requestParams.toJSONString() + "|返回结果：" + submit);
return submit;
}
/**
* ERP通用审核接口
*
* @param params
* @return
*/
public String genericAuditInterface(JSONObject params) throws Exception {
JSONObject requestParams = new JSONObject();
//业务对象标识
String formId = params.getString("formId");
requestParams.put("Ids", params.get("Ids"));//单据内码集合
//调用接口
String audit = client.audit(formId, requestParams.toJSONString());
logger.info("genericAuditInterface|formId：" + formId + "|请求参数：" + requestParams.toJSONString() + "|返回结果：" + audit);
return audit;
}
/**
* 单一采购入库
* 保存->提交->审核
*
* @param params
* @return
*/
public String savePurchaseStorage(String params) {
Gson gsonParams = new Gson();
JSONObject objectParams = gsonParams.fromJson(params, JSONObject.class);
JSONObject model = new JSONObject();
JSONObject FEntity = new JSONObject();
String FMaterialId = (String) objectParams.get("FMaterialId");//物料编码
String FAuxPropId = (String) objectParams.get("FAuxPropId");//物料辅助属性
String FSrcBillNo = (String) objectParams.get("FSrcBillNo");//源单编号
String FUnitID = (String) objectParams.get("FUnitID");//单位
String FDate = (String) objectParams.get("FDate");//物料编码
Double FRealQty = (Double) objectParams.get("FRealQty");//实收数量
String FStockId = (String) objectParams.get("FStockId");//仓库
String F_TOND_Base = "JY(NT)-SA-XS-2020-0039";//京源项目
try {
//业务对象标识
String formId = KingdeeConfig.STK_InStock;
//调用接口
FEntity.put("FOWNERID", KingdeeConfig.getFApplicationOrgId()); //货主(必填项)
JSONObject FPriceUnitIDObject = new JSONObject();
FPriceUnitIDObject.put("FNumber", FUnitID);
FEntity.put("FUnitID", FPriceUnitIDObject); //库存单位(必填项)
FEntity.put("FOWNERTYPEID", "BD_OwnerOrg"); //货主类型(必填项)
FEntity.put("FRemainInStockUnitId", FPriceUnitIDObject); //采购单位(必填项)
JSONObject FMaterialIdObject = new JSONObject();
FMaterialIdObject.put("FNumber", FMaterialId);
FEntity.put("FMaterialId", FMaterialIdObject); //物料编码(必填项)
FEntity.put("FPriceUnitID", FPriceUnitIDObject); //计价单位(必填项)
FEntity.put("FRealQty", FRealQty); //实收数量
JSONObject FStockIdObject = new JSONObject();
FStockIdObject.put("FNumber", FStockId);
FEntity.put("FStockId", FStockIdObject); //仓库
JSONObject FAuxPropIdObject = new JSONObject();
FAuxPropIdObject.put("FAUXPROPID__FF100001", FAuxPropId);
FEntity.put("FAuxPropId", FAuxPropIdObject); //辅助属性
FEntity.put("FSrcBillNo", FSrcBillNo); //源单编号
/* ArrayList<JSONObject> linkList = new ArrayList<>();
JSONObject linkObject = new JSONObject();
linkObject.put("FInStockEntry_Link_FRuleId", "PUR_PurchaseOrder-STK_InStock"); //上游单据和下游单据之间的转换规则
linkObject.put("FInStockEntry_Link_FSTableName", "t_PUR_POOrderEntry"); //源单(上游单据：对应的数据库表名称)
linkObject.put("FInStockEntry_Link_FSBillId", "108022"); //源单单据内码(上游单据：单据内码)
linkObject.put("FInStockEntry_Link_FSId", "165252"); //源单单据行内码(上游单据：单据行内码)
linkList.add(linkObject);
FEntity.put("FInStockEntry_Link", linkList);*/
ArrayList<JSONObject> entityList = new ArrayList<>();
entityList.add(FEntity);
model.put("FInStockEntry", entityList);
model.put("FID", KingdeeConfig.FID);
JSONObject data = new JSONObject();
model.put("FID", KingdeeConfig.FID);
// model.put("FBusinessType", ""); //业务类型(必填项)
// model.put("FOwnerTypeIdHead", ""); //货主类型(必填项)
model.put("FBillTypeID", KingdeeConfig.getFBillTypeIDStorage()); //单据类型(必填项)
model.put("FStockOrgId", KingdeeConfig.getFApplicationOrgId()); //收料组织(必填项)
model.put("FOwnerIdHead", KingdeeConfig.getFApplicationOrgId()); //货主(必填项)
model.put("FPurchaseOrgId", KingdeeConfig.getFApplicationOrgId()); //采购组织(必填项)
model.put("FDate", FDate); //入库日期(必填项)
JSONObject F_TOND_BaseObject = new JSONObject();
F_TOND_BaseObject.put("FNUMBER", F_TOND_Base);
model.put("F_TOND_Base", F_TOND_BaseObject); //京源项目(必填项)
JSONObject FSupplierId = new JSONObject();
FSupplierId.put("FNumber", "VEN04969");
model.put("FSupplierId", FSupplierId); //供应商(必填项)
data.put("Model", model);
String saveParams = data.toJSONString();
String resultJson = client.save(formId, saveParams);
//用于记录结果
Gson gson = new Gson();
//对返回结果进行解析和校验
RepoRet repoRet = gson.fromJson(resultJson, RepoRet.class);
logger.info("savePurchaseStorage接口调用成功|请求参数：" + saveParams + "|返回结果：" + resultJson);
RepoStatus responseStatus = repoRet.getResult().getResponseStatus();
if (responseStatus.isIsSuccess()) {
JSONObject json = new JSONObject();
json.put("formId", KingdeeConfig.STK_InStock);
json.put("Ids", repoRet.getResult().getId());
//采购入库单提交
String commitResult = this.genericCommitInterface(json);
RepoRet commitRepoRet = gson.fromJson(commitResult, RepoRet.class);
if (!commitRepoRet.getResult().getResponseStatus().isIsSuccess()){
logger.error("savePurchaseStorage|请求参数：" + json.toJSONString() + "|返回结果：" + commitRepoRet);
}
//采购入库单审核
String auditResult = this.genericAuditInterface(json);
RepoRet auditRepoRet = gson.fromJson(auditResult, RepoRet.class);
if (!auditRepoRet.getResult().getResponseStatus().isIsSuccess()){
logger.error("savePurchaseStorage|请求参数：" + json.toJSONString() + "|返回结果：" + commitRepoRet);
}
}
return gson.toJson(responseStatus);
} catch (Exception e) {
logger.error("savePurchaseStorage|params：" + params + "|Exception：" + e);
return e.getMessage();
}
}
/**
* ERP通用查看接口
*
* @param params
* @return
*/
public String genericViewInterface(JSONObject params) throws Exception {
JSONObject requestParams = new JSONObject();
//业务对象标识
String formId = params.getString("formId");
requestParams.put("Id", params.get("Id"));//单据内码集合
//调用接口
String audit = client.view(formId, requestParams.toJSONString());
System.out.println(("genericAuditInterface|formId：" + formId + "|请求参数：" + requestParams.toJSONString() + "|返回结果：" + audit));
return audit;
}
/**
* 保存通用组装实体
*
* @param model 模型
* @return
*/
public String saveGenericAssemblyEntity(JSONObject model) {
// 组装数据json
JSONObject result = new JSONObject();
// result.put("NeedUpDateFields", new ArrayList<>());
// result.put("NeedReturnFields", new ArrayList<>());
// result.put("IsDeleteEntry", "true");
// result.put("SubSystemId", "");
// result.put("IsVerifyBaseDataField", "false");
// result.put("IsEntryBatchFill", "true");
// result.put("ValidateFlag", "true");
// result.put("NumberSearch", "true");
// result.put("IsAutoAdjustField", "false");
// result.put("InterationFlags", "");
// result.put("IgnoreInterationFlag", "");
// result.put("IsControlPrecision", "false");
// result.put("ValidateRepeatJson", "false");
// model.put("FID", KingdeeConfig.FID);
// model.put("FBillTypeID", KingdeeConfig.getFBillTypeIDPurchase()); //单据类型(必填项)
// model.put("FApplicationDate", KingdeeConfig.FApplicationDate); //申请日期(必填项)
// model.put("FRequestType", KingdeeConfig.FRequestType); //申请类型(必填项)
// model.put("FApplicationOrgId", KingdeeConfig.getFApplicationOrgId()); //申请组织(必填项)
// model.put("F_TOND_Base", KingdeeConfig.getF_TOND_Base()); //京源项目(必填项)
// model.put("FCurrencyId", KingdeeConfig.getFCurrencyId());
// model.put("FExchangeTypeId", KingdeeConfig.getFExchangeTypeId());
// model.put("FISPRICEEXCLUDETAX", true); //价外税
// model.put("FIsConvert", false); //是否是单据转换
// model.put("FACCTYPE", "Q"); //验收方式
// JSONObject FMobBillHead = new JSONObject();
// FMobBillHead.put("FIsMobBill", false);
// FMobBillHead.put("FMobIsPending", false);
// model.put("FMobBillHead", FMobBillHead); //移动单据
result.put("Model", model);
try {
return result.toJSONString();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* 测试组装实体
*
* @param params
* @return
*/
public String testAssemblyEntity(String params) {
JSONObject model = new JSONObject();
String result = this.saveGenericAssemblyEntity(model);
System.out.println(result);
return result;
}
/**
* ERP通用保存接口
*
* @param params
* @param formId
* @return
* @throws Exception
*/
public String genericSaveInterface(JSONObject params, String formId) throws Exception {
if (StringUtils.isEmpty(formId)) {
return null;
}
//调用接口
String save = client.save(formId, params.toJSONString());
System.out.println(("genericSaveInterface|formId：" + formId + "|请求参数：" + params.toJSONString() + "|返回结果：" + save));
return save;
}
}

29
hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java
Unescape Escape View File

@ -10,10 +10,7 @@ import com.hw.common.security.utils.SecurityUtils;
import com.hw.mes.domain.MesMaterialBom;
import com.hw.mes.domain.MesProductPlan;
import com.hw.mes.domain.MesProductPlanDetail;
import com.hw.mes.domain.vo.MesMaterialScanVo;
import com.hw.mes.domain.vo.MesProductPlanDetailAttachVo;
import com.hw.mes.domain.vo.MesProductPlanDetailCompleteAttachVo;
import com.hw.mes.domain.vo.MesProductPlanDetailVo;
import com.hw.mes.domain.vo.*;
import com.hw.mes.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -39,6 +36,9 @@ public class MesApiController extends BaseController {
@Autowired
private IMesProductPlanDetailService productPlanDetailService;
@Autowired
private IMesBaseBarcodeInfoService mesBaseBarcodeInfoService;
/**
* 查询物料BOM信息列表
*/
@ -176,4 +176,25 @@ public class MesApiController extends BaseController {
public AjaxResult scanMaterial2Confirm(@RequestBody MesMaterialScanVo mesMaterialScanVo) {
return success(productPlanService.scanMaterial2Confirm(mesMaterialScanVo));
}
/**
* 在五楼柜体拆分后绑定背板条码（成品条码）和柜体条码
*/
@Log(title = "条码信息", businessType = BusinessType.BIND)
@PostMapping(("/bindBarcode"))
public AjaxResult bindBarcode(@RequestBody MesBindBarcodeVo mesBindBarcodeVo) {
return success(mesBaseBarcodeInfoService.bindBarcode(mesBindBarcodeVo));
}
/**
* 在五楼柜体拆分后将门板下发给相应工位组装(分配任务)
*/
@Log(title = "柜体分配任务", businessType = BusinessType.ALLOCATE)
@PostMapping(("/assignTask"))
public AjaxResult assignTask(@RequestBody MesAssignTaskVo mesAssignTaskVo) {
productPlanService.assignTask(mesAssignTaskVo);
return success();
}
}

11
hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseBarcodeInfoController.java
Unescape Escape View File

@ -128,4 +128,15 @@ public class MesBaseBarcodeInfoController extends BaseController
{
return success(mesBaseBarcodeInfoService.selectMesBaseBarcodeInfoByBarcodeInfo(barcodeInfo));
}
/**
* 根据绑定的条码信息获取条码信息详细信息
*/
@InnerAuth
@GetMapping(value = "/getBarcodeByBindBarcode/{bindBarcode}")
public AjaxResult getBindBarcodeInfo(@PathVariable("bindBarcode") String bindBarcode)
{
return success(mesBaseBarcodeInfoService.selectMesBaseBarcodeInfoByBindBarcode(bindBarcode));
}
}

39
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/vo/MesAssignTaskVo.java
Unescape Escape View File

@ -0,0 +1,39 @@
package com.hw.mes.domain.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @Description: 五楼柜体拆分后下发任务VO对象
* @ClassName: MesAssignTaskVo
* @Author : xins
* @Date :2024-04-11 15:40
* @Version :1.0
*/
@Data
public class MesAssignTaskVo {
//工位序号，代表第几个工位
@NotNull(message = "工位序号必须输入")
private Integer stationNo;
//物料条码
@NotBlank(message = "物料条码必须输入")
private String materialBarcode;
// //生产计划明细ID
// @NotNull(message = "生产计划明细ID必须输入")
// private Long planDetailId;
//
//
//
// //数量
// @NotNull(message = "数量必须输入")
// private BigDecimal checkAmount;
}

35
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/vo/MesBindBarcodeVo.java
Unescape Escape View File

@ -0,0 +1,35 @@
package com.hw.mes.domain.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @Description: 柜体绑定vo对象
* @ClassName: MesBindBarcodeVo
* @Author : xins
* @Date :2024-04-10 17:09
* @Version :1.0
*/
@Data
public class MesBindBarcodeVo {
//生产计划code
@NotBlank(message = "生产计划Code必须输入")
private String planCode;
//生产计划明细code
@NotBlank(message = "生产计划明细Code必须输入")
private String planDetailCode;
//物料条码
@NotBlank(message = "成品条码必须输入")
private String productBarcode;
//物料条码
@NotBlank(message = "物料条码必须输入")
private String materialBarcode;
}

11
hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseBarcodeInfoMapper.java
Unescape Escape View File

@ -68,4 +68,15 @@ public interface MesBaseBarcodeInfoMapper
* @return 结果
*/
public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds);
/**
* 查询条码信息
*
* @param bindBarcode 绑定条码信息
* @return 条码信息
*/
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBindBarcode(String bindBarcode);
}

17
hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseBarcodeInfoService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.hw.mes.service;
import com.hw.mes.api.domain.MesBaseBarcodeInfo;
import com.hw.mes.domain.vo.MesBindBarcodeVo;
import java.util.List;
@ -76,4 +77,20 @@ public interface IMesBaseBarcodeInfoService
*/
public int printBarCode(Long[] barcodeIds);
/**
* 绑定条码信息(适用于五楼柜体拆分区)
*
* @param mesBindBarcodeVo
* @return
*/
public int bindBarcode(MesBindBarcodeVo mesBindBarcodeVo);
/**
* 查询条码信息
*
* @param bindBarcode 绑定条码信息
* @return 条码信息
*/
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBindBarcode(String bindBarcode);
}

8
hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesProductPlanService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import java.util.List;
import com.hw.mes.domain.MesBaseAttachInfo;
import com.hw.mes.domain.MesProductOrder;
import com.hw.mes.domain.MesProductPlan;
import com.hw.mes.domain.vo.MesAssignTaskVo;
import com.hw.mes.domain.vo.MesMaterialScanVo;
import org.springframework.transaction.annotation.Transactional;
@ -121,4 +122,11 @@ public interface IMesProductPlanService
* @return
*/
public int scanMaterial2Confirm(MesMaterialScanVo mesMaterialScanVo);
/**
* 在五楼柜体拆分区拆分完柜体将门板下发给工位装配
* @param mesAssignTaskVo
*/
public void assignTask(MesAssignTaskVo mesAssignTaskVo);
}

66
hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.hw.mes.service.impl;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.hw.common.core.constant.MesConstants;
@ -12,6 +13,7 @@ import com.hw.common.core.utils.StringUtils;
import com.hw.common.core.utils.uuid.Seq;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.mes.api.domain.MesBaseBarcodeInfo;
import com.hw.mes.domain.vo.MesBindBarcodeVo;
import com.hw.printer.api.RemotePrinterService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -69,6 +71,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
/**
* 新增条码信息
* barcode_type '条码类型（1=原材料,2=半成品,3=成品,4=背板）'
*
* @param mesBaseBarcodeInfo 条码信息
* @return 结果
*/
@ -177,4 +180,67 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
throw new ServiceException(buffer.toString());
}
}
/**
* 绑定条码信息(适用于五楼柜体拆分区)
*
* @param mesBindBarcodeVo
* @return
*/
@Override
public int bindBarcode(MesBindBarcodeVo mesBindBarcodeVo) {
String productBarcode = mesBindBarcodeVo.getProductBarcode();
String materialBarcode = mesBindBarcodeVo.getMaterialBarcode();
String planCode = mesBindBarcodeVo.getPlanCode();
String planDetailCode = mesBindBarcodeVo.getPlanDetailCode();
MesBaseBarcodeInfo productBarcodeInfo = mesBaseBarcodeInfoMapper
.selectMesBaseBarcodeInfoByBarcodeInfo(productBarcode);
if (productBarcodeInfo == null) {
throw new ServiceException("成品条码有误");
}
if (productBarcodeInfo.getBarcodeType().equals(MesConstants.MES_BARCODE_TYPE_RAW)) {
throw new ServiceException("物料条码有误");
}
if (!productBarcodeInfo.getPlanCode().equals(planCode)) {
throw new ServiceException("绑定不匹配，此成品条码工单编号为:" + productBarcodeInfo.getPlanCode());
}
if (StringUtils.isNotEmpty(productBarcodeInfo.getBindBarcode())) {
throw new ServiceException("此成品条码已经绑定，无需重复绑定");
}
MesBaseBarcodeInfo materialBarcodeInfo = mesBaseBarcodeInfoMapper
.selectMesBaseBarcodeInfoByBarcodeInfo(materialBarcode);
if (materialBarcodeInfo == null ||
!materialBarcodeInfo.getBarcodeType().equals(MesConstants.MES_BARCODE_TYPE_RAW)) {
throw new ServiceException("物料条码有误");
}
productBarcodeInfo.setBindBarcode(materialBarcode);
productBarcodeInfo.setBindBy(SecurityUtils.getUsername());
productBarcodeInfo.setBindTime(new Date());
productBarcodeInfo.setBindStatus(MesConstants.MES_BARCODE_BIND_STATUS_BINDING);
productBarcodeInfo.setPlanDetailCode(planDetailCode);
return mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(productBarcodeInfo);
}
/**
* 查询条码信息
*
* @param bindBarcode 绑定条码信息
* @return 条码信息
*/
@Override
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBindBarcode(String bindBarcode) {
return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBindBarcode(bindBarcode);
}
}

8
hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanDetailServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.hw.mes.service.impl;
import com.hw.common.core.constant.MesConstants;
import com.hw.common.core.exception.ServiceException;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.core.utils.StringUtils;
import com.hw.common.core.utils.uuid.Seq;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.mes.domain.MesMaterialCheckResult;
@ -60,6 +61,9 @@ public class MesProductPlanDetailServiceImpl implements IMesProductPlanDetailSer
*/
@Override
public List<MesProductPlanDetail> selectMesProductPlanDetailList(MesProductPlanDetail mesProductPlanDetail) {
if(mesProductPlanDetail.getPlanId()==null){
return new ArrayList<MesProductPlanDetail>();
}
return mesProductPlanDetailMapper.selectMesProductPlanDetailList(mesProductPlanDetail);
}
@ -241,8 +245,8 @@ public class MesProductPlanDetailServiceImpl implements IMesProductPlanDetailSer
Date currentDate = new Date();
String userName = SecurityUtils.getUsername();
BigDecimal planAmount = null;
if (mesProductPlanDetail.getAttachId() != null) {//如果是按图纸生产的
String attachId = dbProductPlan.getAttachId();
String attachId = dbProductPlan.getAttachId();
if (StringUtils.isNotEmpty(attachId)) {//如果是按图纸生产的
String[] attachIdArr = attachId.split(",");
planAmount = new BigDecimal(attachIdArr.length);
} else {

23
hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java
Unescape Escape View File

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import com.alibaba.fastjson.JSONObject;
import com.hw.common.core.constant.MesConstants;
import com.hw.common.core.exception.ServiceException;
import com.hw.common.core.utils.DateUtils;
@ -12,11 +13,13 @@ import com.hw.common.core.utils.uuid.Seq;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.mes.api.domain.MesBaseBarcodeInfo;
import com.hw.mes.domain.*;
import com.hw.mes.domain.vo.MesAssignTaskVo;
import com.hw.mes.domain.vo.MesMaterialScanVo;
import com.hw.mes.mapper.*;
import com.hw.mes.service.IMesBaseAttachInfoService;
import com.hw.mes.service.IMesProductOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@ -57,6 +60,9 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService {
@Autowired
private MesBaseBarcodeInfoMapper mesBaseBarcodeInfoMapper;
@Autowired
private StringRedisTemplate redisTemplate;
/**
* 查询生产派工
*
@ -189,6 +195,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService {
/**
* 获取生产派工附件List列表
*
* @param planId
* @param attachType
* @return
@ -197,7 +204,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService {
public List<MesBaseAttachInfo> getDispatchAttachList(Long planId, String attachType) {
MesProductPlan mesProductPlan = mesProductPlanMapper.selectMesProductPlanByPlanId(planId);
try {
if (attachType.equals(MesConstants.MES_ATTACH_TYPE_DRAWING)){
if (attachType.equals(MesConstants.MES_ATTACH_TYPE_DRAWING)) {
if (StringUtils.isEmpty(mesProductPlan.getAttachId())) {
return new ArrayList<>();
}
@ -361,7 +368,21 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService {
mesMaterialCheckResultDetailMapper.insertMesMaterialCheckResultDetail(mesMaterialCheckResultDetail);
return 1;
}
/**
* 在五楼柜体拆分区拆分完柜体将门板下发给工位装配
* @param mesAssignTaskVo
*/
@Override
public void assignTask(MesAssignTaskVo mesAssignTaskVo) {
//1、先发布信息，设置超时时间，如果超时需要删除此key，避免重复读取
redisTemplate.convertAndSend(MesConstants.MES_ASSIGN_TASK_KEY, mesAssignTaskVo.getStationNo());
//2、订阅者读取此条信息后会给出反馈，需要在程序已开始订阅此条反馈信息，如果在10s内返回，则成功，如果10s内失败则失败
System.out.println(redisTemplate.opsForValue().get(MesConstants.MES_ASSIGN_TASK_KEY));
// redisTemplate.c
}
}

41
hw-modules/hw-mes/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -15,15 +15,48 @@ spring:
discovery:
# 服务注册地址
server-addr: 175.27.215.92:8848
namespace: jyhb
group: DEFAULT_GROUP
namespace: jyhb-test
group: xins
config:
# 配置中心地址
server-addr: 175.27.215.92:8848
namespace: jyhb
group: DEFAULT_GROUP
namespace: jyhb-test
group: xins
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
## Tomcat
#server:
# port: 7305
#
## Spring
#spring:
# application:
# # 应用名称
# name: hw-mes
# profiles:
# # 环境配置
# active: prod
# cloud:
# nacos:
# discovery:
# # 服务注册地址
# server-addr: 127.0.0.1:8848
# namespace: jyhb
# group: DEFAULT_GROUP
# config:
# # 配置中心地址
# server-addr: 127.0.0.1:8848
# namespace: jyhb
# group: DEFAULT_GROUP
# # 配置文件格式
# file-extension: yml
# # 共享配置
# shared-configs:
# - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

6
hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml
Unescape Escape View File

@ -211,6 +211,7 @@
<if test="projectNo != null">project_no = #{projectNo},</if>
<if test="serialNumber != null">serial_number = #{serialNumber},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="bindBarcode != null">bind_barcode = #{bindBarcode},</if>
<if test="bindStatus != null">bind_status = #{bindStatus},</if>
<if test="bindBy != null">bind_by = #{bindBy},</if>
<if test="bindTime != null">bind_time = #{bindTime},</if>
@ -237,4 +238,9 @@
<include refid="selectMesBaseBarcodeInfoVo"/>
where bbi.barcode_info = #{barcodeInfo} limit 1
</select>
<select id="selectMesBaseBarcodeInfoByBindBarcode" parameterType="String" resultMap="MesBaseBarcodeInfoResult">
<include refid="selectMesBaseBarcodeInfoVo"/>
where bbi.bind_barcode = #{bindBarcode} limit 1
</select>
</mapper>

11
hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java
Unescape Escape View File

@ -49,6 +49,7 @@ public class WmsApiController extends BaseController {
// @RequiresPermissions("wms:rawoutstock:list")
@GetMapping("/getWarehouses")
public AjaxResult getWarehouses(WmsBaseWarehouse queryBaseWarehouse) {
queryBaseWarehouse.setWarehouseInstockType(WmsConstants.WMS_WAREHOUSE_INSTOCK_TYPE_RAW);
List<WmsBaseWarehouse> list = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryBaseWarehouse);
return success(list);
}
@ -130,4 +131,14 @@ public class WmsApiController extends BaseController {
return toAjax(wmsProductInstockService.fourthFloorProduceInstock(wmsProduceInstockVo));
}
/**
* 申请返库
*/
@Log(title = "原材料返库记录", businessType = BusinessType.APPLY)
@PostMapping(("/applyRawBack"))
public AjaxResult applyRawBack(@Validated @RequestBody WmsRawBackVo wmsRawBackVo) {
return toAjax(wmsRawInstockService.applyRawBack(wmsRawBackVo));
}
}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save