diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java index f839449e..d644562f 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java @@ -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; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java index d87bd40e..427d74e1 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java @@ -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 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 itemQueryWrapper = new QueryWrapper<>(); + itemQueryWrapper.setEntity(inspectionItem); + List inspectionItems = inspectionItemService.list(itemQueryWrapper); + if (inspectionItems.size()<1 || inspectionItems.equals(null)){ + return null; //检验编号错误 } -// return R.ok(resourceInspectPlanService.save(resourceInspectPlan)); - return null; + QueryWrapper inspectionItemDetail = new QueryWrapper<>(); + InspectionItemDetail inspectionItemDetail1 = new InspectionItemDetail(); + inspectionItemDetail1.setInspectionItemBo(handle); + inspectionItemDetail.setEntity(inspectionItemDetail1); + List inspectionItemDetailList = inspectionItemDetailService.list(inspectionItemDetail); + return R.ok(inspectionItemDetailList); } } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java index 095de6d4..a5c22c40 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java @@ -151,13 +151,17 @@ public class ResourceInspectResourceController { String equipTypeBo = HandleEnum.RESOURCE_TYPE.getHandle(site,equipType); EquipTypeEquip equipTypeEquip = new EquipTypeEquip(); equipTypeEquip.setEquipTypeBo( equipTypeBo ); - List equipTypeEquips = equipTypeEquipService.selectList( equipTypeEquip ); +// List equipTypeEquips = equipTypeEquipService.selectList( equipTypeEquip ); + QueryWrapper equipTypeEquipQueryWrapper = new QueryWrapper<>(); + equipTypeEquipQueryWrapper.setEntity(equipTypeEquip); + List 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); diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java index 4e3c4f29..1bc74d3b 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java @@ -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 { private static final long serialVersionUID = 1L; @@ -138,29 +140,30 @@ public class ResourceInspectPlan extends Model { * 设备清单 */ @TableField(exist = false) - private List maintainPlanEquips = new ArrayList<>(); + private List maintainPlanEquipList = new ArrayList<>(); /** * 检验项目清单（检验项清单，与inspectionItemBo对应） * 因为会出现模块之间的循环依赖，故不提供该字段 */ - /*@TableField(exist = false) - private List inspectionItemList = new ArrayList<>();*/ + @TableField(exist = false) + private List inspectionItemDetailList = new ArrayList<>(); + - public List getMaintainPlanEquips() { - return maintainPlanEquips; + public List getMaintainPlanEquipList() { + return maintainPlanEquipList; } - public void setMaintainPlanEquips(List maintainPlanEquips) { - this.maintainPlanEquips = maintainPlanEquips; + public void setMaintainPlanEquips(List maintainPlanEquipList) { + this.maintainPlanEquipList = maintainPlanEquipList; } - /*public List getInspectionItemList() { - return inspectionItemList; + public List getInspectionItemDetailList() { + return inspectionItemDetailList; } - public void setInspectionItemList(List inspectionItemList) { - this.inspectionItemList = inspectionItemList; - }*/ + public void setInspectionItemDetailList(List inspectionItemDetailList) { + this.inspectionItemDetailList = inspectionItemDetailList; + } public String getHandle() { return handle; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java index 8850e0f2..2ba2ce0b 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java @@ -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; /** *

@@ -20,7 +22,7 @@ import com.baomidou.mybatisplus.annotation.IdType; */ @TableName("Z_RESOURCE_INSPECT_RESOURCE") - +@JsonIgnoreProperties(ignoreUnknown = true) public class ResourceInspectResource extends Model { private static final long serialVersionUID = 1L; @@ -80,7 +82,9 @@ public class ResourceInspectResource extends Model { */ @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; - + /** + * 序号 + */ @TableField(exist = false) private Integer itemSeq; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java index 3d111a54..48bf3351 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java @@ -25,4 +25,6 @@ public interface ResourceInspectPlanService extends IService selectPage(FrontPage frontPage, ResourceInspectPlan resourceInspectPlan); List selectList(ResourceInspectPlan resourceInspectPlan); + + boolean saveResourcePlanData(ResourceInspectPlan resourceInspectPlan); } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java index d14a3975..868072f9 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java @@ -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; /** *

@@ -28,6 +37,19 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, ResourceInspectPlan resourceInspectPlan) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -42,5 +64,54 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl resourceWrapper = new QueryWrapper<>(); + resourceWrapper.setEntity(resourceInspect); +// resourceInspectResourceService.remove(resourceWrapper); + // 2、全增 + List 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 inspectionItemWrapper = new QueryWrapper<>(); + inspectionItemWrapper.setEntity(inspectionItem); + List inspectionItems = inspectionItemService.list(inspectionItemWrapper); + // 如果不存在，则返回错误 + if (inspectionItems==null||inspectionItems.size()<1){ + return false; + } + resourceInspectPlanService.saveOrUpdate(resourceInspectPlan); + return false; + } + } \ No newline at end of file