Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备管理模块--设备检验计划模块更新

Browse Source
zpl 4 years ago
parent 06964c02c0
commit ccdeb40419
7 changed files with 134 additions and 38 deletions
Show Stats Download Patch File Download Diff File

4
common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java
Unescape Escape View File

@ -72,10 +72,8 @@ public enum HandleEnum {
RESOURCE_INSPECT_TASK("ResourceInspectTaskBo","ResourceInspectTaskBo:{0},{1}"),
/**设备检验任务的检验项**/
RESOURCE_INSPECT_TASK_PARAM("ResourceInspectTaskParamBo","ResourceInspectTaskParamBo:{0},{1}"),
RESOURCE_INSPECT_TASK_PARAM("ResourceInspectTaskParamBo","ResourceInspectTaskParamBo:{0},{1}");
/** pavel_liu 检验项目清单 **/
INSPECTION_ITEM("InspectionItemBo","InspectionItemBo:{0},{1},{2}");
private String prefix;

48
equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java
Unescape Escape View File

@ -1,6 +1,10 @@
package com.foreverwin.mesnac.equip.controller;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.equip.model.ResourceInspectResource;
import com.foreverwin.mesnac.equip.service.ResourceInspectResourceService;
import com.foreverwin.modular.core.util.R;
@ -32,8 +36,10 @@ public class ResourceInspectPlanController {
public ResourceInspectPlanService resourceInspectPlanService;
@Autowired
public ResourceInspectResourceService resourceInspectResourceService;
public InspectionItemService inspectionItemService;
@Autowired
public InspectionItemDetailService inspectionItemDetailService;
/**
* 根据id查询
*
@ -145,24 +151,32 @@ public class ResourceInspectPlanController {
*/
@PostMapping(value = "/saveOrUpdate")
public R saveOrUpdate(@RequestBody ResourceInspectPlan resourceInspectPlan) {
String handle = resourceInspectPlan.getHandle();
ResourceInspectPlan inspectPlan = resourceInspectPlanService.getById(handle);
// 根据handle，判断新增或修改
if (inspectPlan==null||inspectPlan.equals(null)){
String site = CommonMethods.getSite();
String revision = resourceInspectPlan.getRevision();
String planNo = resourceInspectPlan.getPlanNo();
handle = HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site,planNo, revision);
}
String inspectionItemBo = resourceInspectPlan.getInspectionItemBo();
return R.ok(resourceInspectPlanService.saveResourcePlanData(resourceInspectPlan));
}
List<ResourceInspectResource> equips = resourceInspectPlan.getMaintainPlanEquips();
for (ResourceInspectResource equip: equips) {
equip.setResourceInspectPlanBo(handle);
// resourceInspectResourceService.saveOrUpdate(equip);
/**
* 依据项目清单handle获取检验项
* @param inspectionItem
* @return
*/
@ResponseBody
@RequestMapping("/getAddItemDetailList")
public R getInspectItem(InspectionItem inspectionItem){
String handle = inspectionItem.getHandle();
// String site = CommonMethods.getSite();
// String inspectionItemHandle = HandleEnum.INSPECTION_ITEM.getHandle(site,inspectionType);
QueryWrapper<InspectionItem> itemQueryWrapper = new QueryWrapper<>();
itemQueryWrapper.setEntity(inspectionItem);
List<InspectionItem> inspectionItems = inspectionItemService.list(itemQueryWrapper);
if (inspectionItems.size()<1 || inspectionItems.equals(null)){
return null; //检验编号错误
}
// return R.ok(resourceInspectPlanService.save(resourceInspectPlan));
return null;
QueryWrapper<InspectionItemDetail> inspectionItemDetail = new QueryWrapper<>();
InspectionItemDetail inspectionItemDetail1 = new InspectionItemDetail();
inspectionItemDetail1.setInspectionItemBo(handle);
inspectionItemDetail.setEntity(inspectionItemDetail1);
List<InspectionItemDetail> inspectionItemDetailList = inspectionItemDetailService.list(inspectionItemDetail);
return R.ok(inspectionItemDetailList);
}
}

6
equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java
Unescape Escape View File

@ -151,13 +151,17 @@ public class ResourceInspectResourceController {
String equipTypeBo = HandleEnum.RESOURCE_TYPE.getHandle(site,equipType);
EquipTypeEquip equipTypeEquip = new EquipTypeEquip();
equipTypeEquip.setEquipTypeBo( equipTypeBo );
List<EquipTypeEquip> equipTypeEquips = equipTypeEquipService.selectList( equipTypeEquip );
// List<EquipTypeEquip> equipTypeEquips = equipTypeEquipService.selectList( equipTypeEquip );
QueryWrapper<EquipTypeEquip> equipTypeEquipQueryWrapper = new QueryWrapper<>();
equipTypeEquipQueryWrapper.setEntity(equipTypeEquip);
List<EquipTypeEquip> equipTypeEquips = equipTypeEquipService.list(equipTypeEquipQueryWrapper);
for (EquipTypeEquip ete :equipTypeEquips) {
String equipBo = ete.getEquipBo();
Equip equip = equipService.getById( equipBo );
ResourceInspectResource resourceInspectResource = new ResourceInspectResource();
resourceInspectResource.setResourceNo( equip.getResrce() );
resourceInspectResource.setDescription( equip.getDescription() );
resourceInspectResource.setResourceBo(equip.getHandle());
resourceList.add( resourceInspectResource );
}
return R.ok(resourceList);

31
equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java
Unescape Escape View File

@ -5,13 +5,15 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
//import com.foreverwin.mesnac.quality.model.InspectionItem;
/**
@ -24,7 +26,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
*/
@TableName("Z_RESOURCE_INSPECT_PLAN")
@JsonIgnoreProperties(ignoreUnknown = true)
public class ResourceInspectPlan extends Model<ResourceInspectPlan> {
private static final long serialVersionUID = 1L;
@ -138,29 +140,30 @@ public class ResourceInspectPlan extends Model<ResourceInspectPlan> {
* 设备清单
*/
@TableField(exist = false)
private List<ResourceInspectResource> maintainPlanEquips = new ArrayList<>();
private List<ResourceInspectResource> maintainPlanEquipList = new ArrayList<>();
/**
* 检验项目清单（检验项清单，与inspectionItemBo对应）
* 因为会出现模块之间的循环依赖，故不提供该字段
*/
/*@TableField(exist = false)
private List<InspectionItem> inspectionItemList = new ArrayList<>();*/
@TableField(exist = false)
private List<InspectionItemDetail> inspectionItemDetailList = new ArrayList<>();
public List<ResourceInspectResource> getMaintainPlanEquips() {
return maintainPlanEquips;
public List<ResourceInspectResource> getMaintainPlanEquipList() {
return maintainPlanEquipList;
}
public void setMaintainPlanEquips(List<ResourceInspectResource> maintainPlanEquips) {
this.maintainPlanEquips = maintainPlanEquips;
public void setMaintainPlanEquips(List<ResourceInspectResource> maintainPlanEquipList) {
this.maintainPlanEquipList = maintainPlanEquipList;
}
/*public List<InspectionItem> getInspectionItemList() {
return inspectionItemList;
public List<InspectionItemDetail> getInspectionItemDetailList() {
return inspectionItemDetailList;
}
public void setInspectionItemList(List<InspectionItem> inspectionItemList) {
this.inspectionItemList = inspectionItemList;
}*/
public void setInspectionItemDetailList(List<InspectionItemDetail> inspectionItemDetailList) {
this.inspectionItemDetailList = inspectionItemDetailList;
}
public String getHandle() {
return handle;

10
equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java
Unescape Escape View File

@ -5,10 +5,12 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
/**
* <p>
@ -20,7 +22,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
*/
@TableName("Z_RESOURCE_INSPECT_RESOURCE")
@JsonIgnoreProperties(ignoreUnknown = true)
public class ResourceInspectResource extends Model<ResourceInspectResource> {
private static final long serialVersionUID = 1L;
@ -80,7 +82,9 @@ public class ResourceInspectResource extends Model<ResourceInspectResource> {
*/
@TableField("MODIFIED_DATE_TIME")
private LocalDateTime modifiedDateTime;
/**
* 序号
*/
@TableField(exist = false)
private Integer itemSeq;

2
equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java
Unescape Escape View File

@ -25,4 +25,6 @@ public interface ResourceInspectPlanService extends IService<ResourceInspectPlan
IPage<ResourceInspectPlan> selectPage(FrontPage<ResourceInspectPlan> frontPage, ResourceInspectPlan resourceInspectPlan);
List<ResourceInspectPlan> selectList(ResourceInspectPlan resourceInspectPlan);
boolean saveResourcePlanData(ResourceInspectPlan resourceInspectPlan);
}

71
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
Unescape Escape View File

@ -1,5 +1,13 @@
package com.foreverwin.mesnac.equip.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.equip.model.ResourceInspectResource;
import com.foreverwin.mesnac.equip.service.ResourceInspectResourceService;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -11,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
@ -28,6 +37,19 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
@Autowired
private ResourceInspectPlanMapper resourceInspectPlanMapper;
@Autowired
public ResourceInspectPlanService resourceInspectPlanService;
@Autowired
public InspectionItemService inspectionItemService;
@Autowired
public InspectionItemDetailService inspectionItemDetailService;
@Autowired
public ResourceInspectResourceService resourceInspectResourceService;
@Override
public IPage<ResourceInspectPlan> selectPage(FrontPage<ResourceInspectPlan> frontPage, ResourceInspectPlan resourceInspectPlan) {
QueryWrapper<ResourceInspectPlan> queryWrapper = new QueryWrapper<>();
@ -42,5 +64,54 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
return super.list(queryWrapper);
}
@Override
public boolean saveResourcePlanData(ResourceInspectPlan resourceInspectPlan) {
// 创建人员
String user = CommonMethods.getUser();
//查询设备计划是否存在
String site = CommonMethods.getSite();
String planNo = resourceInspectPlan.getPlanNo();
String revision = resourceInspectPlan.getRevision();
String handle = HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site, planNo, revision);
ResourceInspectPlan resourceInspectPlanByBanlde = resourceInspectPlanService.getById(handle);
//计划是否已存在： 更新计划主表
//1、计划不存在： 新增计划主表
if (resourceInspectPlanByBanlde==null){
}
//2、计划存在： 更新计划主表
//保存计划下设备清单(全删全增)
// 1、全删
ResourceInspectResource resourceInspect = new ResourceInspectResource();
resourceInspect.setResourceInspectPlanBo(handle);
QueryWrapper<ResourceInspectResource> resourceWrapper = new QueryWrapper<>();
resourceWrapper.setEntity(resourceInspect);
// resourceInspectResourceService.remove(resourceWrapper);
// 2、全增
List<ResourceInspectResource> equips = resourceInspectPlan.getMaintainPlanEquipList();
for (ResourceInspectResource equip: equips) {
equip.setResourceInspectPlanBo(handle);
equip.setCreateUser(user);
equip.setCreatedDateTime(LocalDateTime.now());
// resourceInspectResourceService.save(equip);
}
// 判断检验项目清单HANDLE是否存在
String inspectionItemBo = resourceInspectPlan.getInspectionItemBo();
InspectionItem inspectionItem = new InspectionItem();
inspectionItem.setHandle(inspectionItemBo);
QueryWrapper<InspectionItem> inspectionItemWrapper = new QueryWrapper<>();
inspectionItemWrapper.setEntity(inspectionItem);
List<InspectionItem> inspectionItems = inspectionItemService.list(inspectionItemWrapper);
// 如果不存在，则返回错误
if (inspectionItems==null||inspectionItems.size()<1){
return false;
}
resourceInspectPlanService.saveOrUpdate(resourceInspectPlan);
return false;
}
}
Write Preview
Loading…
Cancel
Save