首件相关接口未联调提供

application-facade/src/main/java/com/factory/controller/pad/InitialPlanPadController.java

@@ -0,0 +1,61 @@
+package com.factory.controller.pad;
+
+
+import com.factory.base.entity.aggregates.ResponseBean;
+import com.factory.base.entity.vo.req.BaseTypeReq;
+import com.factory.entity.vo.req.pad.workDetailsReq;
+import com.factory.entity.vo.res.pad.ini.planlistRes;
+import com.factory.entity.vo.res.pad.ini.workDetailsRes;
+import com.factory.entity.vo.res.pad.ini.workTypeDetailsRes;
+import com.factory.service.ini.BentelerIniVersionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiOperationSupport;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 计划 - 检验报告单
+ *
+ * @author Dl
+ * @date 2021-05-12 09:37:25
+ */
+@Api(tags = "本特勒 - 首件")
+@RestController
+@RequestMapping("/benteler/pad")
+@Slf4j
+public class InitialPlanPadController {
+    @Autowired
+    private BentelerIniVersionService versionService;
+
+    @ApiOperation(value = "首件记录列表")
+    @PostMapping("/planlist")
+    @ApiOperationSupport(order = 1)
+    public ResponseBean<planlistRes> planlist() {
+
+       return versionService.planPadlist();
+    }
+    @ApiOperation(value = "首件工作站详情")
+    @PostMapping("/workDetails")
+    @ApiOperationSupport(order = 1)
+    public ResponseBean<List<workDetailsRes>> workDetails(@RequestBody BaseTypeReq req) {
+
+       return versionService.workDetails(req);
+    }
+    @ApiOperation(value = "工作站单类别详情")
+    @PostMapping("/workTypeDetails")
+    @ApiOperationSupport(order = 1)
+    public ResponseBean<workTypeDetailsRes> workTypeDetails(@RequestBody workDetailsReq req) {
+
+       return versionService.workTypeDetails(req);
+    }
+
+
+
+}

application-facade/src/main/java/com/factory/controller/initial/InitialPlanController.java → application-facade/src/main/java/com/factory/controller/web/initial/InitialPlanWebController.java

@@ -1,22 +1,19 @@
-package com.factory.controller.initial;
+package com.factory.controller.web.initial;
 
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.factory.base.config.validateGroup.GroupOne;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.po.benteler.BentelerIniVersion;
-import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.entity.vo.req.BaseIdReq;
 import com.factory.base.entity.vo.req.BasePageIdReq;
 import com.factory.base.util.res.ResponseBeanBuilder;
-import com.factory.entity.vo.req.AddIniPlanReq;
-import com.factory.entity.vo.req.BooleanReq;
-import com.factory.entity.vo.req.PlanListReq;
-import com.factory.entity.vo.req.exportInitialPlanReq;
+import com.factory.entity.vo.req.web.AddIniPlanReq;
+import com.factory.entity.vo.req.web.BooleanReq;
+import com.factory.entity.vo.req.web.PlanListReq;
+import com.factory.entity.vo.req.web.exportInitialPlanReq;
 import com.factory.entity.vo.res.FileRes;
-import com.factory.entity.vo.res.benteler.*;
-import com.factory.service.BentelerIniVersionService;
+import com.factory.entity.vo.res.web.ini.*;
+import com.factory.service.ini.BentelerIniVersionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperationSupport;
@@ -28,9 +25,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 计划 - 检验报告单
  *
@@ -39,9 +33,9 @@ import java.util.Map;
  */
 @Api(tags = "本特勒 - 首件")
 @RestController
-@RequestMapping("/benteler")
+@RequestMapping("/benteler/web")
 @Slf4j
-public class InitialPlanController {
+public class InitialPlanWebController {
     @Autowired
     private BentelerIniVersionService bentelerIniVersionService;
     @ApiOperation(value = "新建首件计划")

application-facade/src/main/java/com/factory/entity/vo/req/pad/GetVersionCheckItemReq.java

@@ -0,0 +1,38 @@
+package com.factory.entity.vo.req.pad;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @program: intelligentfactory
+ * @description:
+ * @author: dl
+ * @create: 07月01日 10时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class GetVersionCheckItemReq {
+
+
+    @ApiModelProperty(value = "点检日期")
+    private LocalDate localDate;
+    @ApiModelProperty(value = "点检类型")
+    private Integer checkType;
+    @ApiModelProperty(value = "版本Id")
+    private Long versionId;
+
+
+
+}

application-facade/src/main/java/com/factory/entity/vo/req/pad/workDetailsReq.java

@@ -0,0 +1,35 @@
+package com.factory.entity.vo.req.pad;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: intelligentfactory
+ * @description:
+ * @author: dl
+ * @create: 07月01日 12时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class workDetailsReq {
+    @ApiModelProperty(value = "版本id")
+    private Long versionId;
+
+    @ApiModelProperty(value = "生产线")
+    private String productionLine;
+
+    @ApiModelProperty(value = "工作站")
+    private String workstation;
+
+    @ApiModelProperty(value = "1首件 2两百 3防错")
+    private Integer checkType;
+}

application-facade/src/main/java/com/factory/entity/vo/req/AddIniPlanItemReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/AddIniPlanItemReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

application-facade/src/main/java/com/factory/entity/vo/req/AddIniPlanReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/AddIniPlanReq.java

@@ -1,8 +1,7 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.factory.base.config.validateGroup.GroupOne;
-import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,9 +13,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import java.sql.Time;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
 

application-facade/src/main/java/com/factory/entity/vo/req/AddIniPlanWorkReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/AddIniPlanWorkReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

application-facade/src/main/java/com/factory/entity/vo/req/BooleanReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/BooleanReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import com.factory.base.entity.vo.req.BaseIdReq;
 import io.swagger.annotations.ApiModelProperty;

application-facade/src/main/java/com/factory/entity/vo/req/PlanListReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/PlanListReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import com.factory.base.entity.vo.req.BasePageReq;
 import com.fasterxml.jackson.annotation.JsonInclude;

application-facade/src/main/java/com/factory/entity/vo/req/UserInsertReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/UserInsertReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

application-facade/src/main/java/com/factory/entity/vo/req/UserLockReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/UserLockReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

application-facade/src/main/java/com/factory/entity/vo/req/UserPageQueryReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/UserPageQueryReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import com.factory.base.entity.vo.req.BasePageReq;
 import io.swagger.annotations.ApiModel;

application-facade/src/main/java/com/factory/entity/vo/req/exportInitialPlanReq.java → application-facade/src/main/java/com/factory/entity/vo/req/web/exportInitialPlanReq.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.req;
+package com.factory.entity.vo.req.web;
 
 import com.factory.base.entity.vo.req.BaseIdReq;
 import io.swagger.annotations.ApiModelProperty;

application-facade/src/main/java/com/factory/entity/vo/res/pad/ini/getNowCheckStatusRes.java

@@ -0,0 +1,31 @@
+package com.factory.entity.vo.res.pad.ini;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class getNowCheckStatusRes {
+
+    @ApiModelProperty(name = "计划id")
+    private Long planId;
+    @ApiModelProperty(name = "计划名称")
+    private String planName;
+    @ApiModelProperty(name = "版本Id")
+    private Long versionId;
+    @ApiModelProperty(name = "点检表Id")
+    private Long ResultId;
+    @ApiModelProperty(name = "点检状态")
+    private Integer checkStatus;
+
+
+}

application-facade/src/main/java/com/factory/entity/vo/res/pad/ini/planlistRes.java

@@ -0,0 +1,22 @@
+package com.factory.entity.vo.res.pad.ini;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class planlistRes {
+    private List<getNowCheckStatusRes> unFinish;
+    private List<getNowCheckStatusRes> inifinish;
+    private List<getNowCheckStatusRes> twoFinish;
+}

application-facade/src/main/java/com/factory/entity/vo/res/pad/ini/workDetailsRes.java

@@ -0,0 +1,26 @@
+package com.factory.entity.vo.res.pad.ini;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class workDetailsRes {
+
+    @ApiModelProperty(name = "工作站名称")
+    private String workName;
+
+    @ApiModelProperty(name = "提交状态 1 保存 2未保存")
+    private Integer submitType;
+
+
+}

application-facade/src/main/java/com/factory/entity/vo/res/pad/ini/workTypeDetailsRes.java

@@ -0,0 +1,35 @@
+package com.factory.entity.vo.res.pad.ini;
+
+import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
+import com.factory.base.entity.po.benteler.BentelerIniWorkstation;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @program: intelligentfactory
+ * @description:
+ * @author: dl
+ * @create: 07月01日 13时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class workTypeDetailsRes {
+    @ApiModelProperty(value = "点检项")
+    private List<BentelerIniWorkstation> versionItems;
+    @ApiModelProperty(value = "是否使用工具")
+    private Boolean useTool;
+    @ApiModelProperty(value = "工具备注")
+    private String toolRemark;
+
+}

application-facade/src/main/java/com/factory/entity/vo/res/benteler/GetVersionBaseRes.java → application-facade/src/main/java/com/factory/entity/vo/res/web/ini/GetVersionBaseRes.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.res.benteler;
+package com.factory.entity.vo.res.web.ini;
 
 import com.factory.base.config.validateGroup.GroupOne;
 import io.swagger.annotations.ApiModelProperty;

application-facade/src/main/java/com/factory/entity/vo/res/benteler/GetVersionHistoryRes.java → application-facade/src/main/java/com/factory/entity/vo/res/web/ini/GetVersionHistoryRes.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.res.benteler;
+package com.factory.entity.vo.res.web.ini;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

application-facade/src/main/java/com/factory/entity/vo/res/benteler/PagePlanRes.java → application-facade/src/main/java/com/factory/entity/vo/res/web/ini/PagePlanRes.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.res.benteler;
+package com.factory.entity.vo.res.web.ini;
 
 import com.factory.base.entity.vo.req.BaseIdReq;
 import com.fasterxml.jackson.annotation.JsonInclude;

application-facade/src/main/java/com/factory/entity/vo/res/benteler/getCheckResutGreadRes.java → application-facade/src/main/java/com/factory/entity/vo/res/web/ini/getCheckResutGreadRes.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.res.benteler;
+package com.factory.entity.vo.res.web.ini;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

application-facade/src/main/java/com/factory/entity/vo/res/benteler/unAuditListRes.java → application-facade/src/main/java/com/factory/entity/vo/res/web/ini/unAuditListRes.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.res.benteler;
+package com.factory.entity.vo.res.web.ini;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

application-facade/src/main/java/com/factory/mapper/BentelerIniCheckItemMapper.java → application-facade/src/main/java/com/factory/mapper/ini/BentelerIniCheckItemMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper;
+package com.factory.mapper.ini;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniCheckItem;

application-facade/src/main/java/com/factory/mapper/BentelerIniCheckResultMapper.java → application-facade/src/main/java/com/factory/mapper/ini/BentelerIniCheckResultMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper;
+package com.factory.mapper.ini;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniCheckResult;

application-facade/src/main/java/com/factory/mapper/BentelerIniCheckTypeMapper.java → application-facade/src/main/java/com/factory/mapper/ini/BentelerIniCheckTypeMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper;
+package com.factory.mapper.ini;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniCheckType;

application-facade/src/main/java/com/factory/mapper/BentelerIniVersionItemMapper.java → application-facade/src/main/java/com/factory/mapper/ini/BentelerIniVersionItemMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper;
+package com.factory.mapper.ini;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;

application-facade/src/main/java/com/factory/mapper/BentelerIniVersionMapper.java → application-facade/src/main/java/com/factory/mapper/ini/BentelerIniVersionMapper.java

@@ -1,18 +1,20 @@
-package com.factory.mapper;
+package com.factory.mapper.ini;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.factory.base.entity.aggregates.PageBean;
-import com.factory.base.entity.aggregates.ResponseBean;
+import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
 import com.factory.base.entity.po.benteler.BentelerIniVersion;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
-import com.factory.base.entity.po.benteler.BentelerPlan;
-import com.factory.entity.vo.req.PlanListReq;
-import com.factory.entity.vo.res.benteler.PagePlanRes;
-import com.factory.entity.vo.res.benteler.unAuditListRes;
+import com.factory.entity.vo.req.pad.GetVersionCheckItemReq;
+import com.factory.entity.vo.req.web.PlanListReq;
+import com.factory.entity.vo.res.pad.ini.getNowCheckStatusRes;
+import com.factory.entity.vo.res.web.ini.PagePlanRes;
+import com.factory.entity.vo.res.web.ini.unAuditListRes;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 计划 - 版本信息
  * 
@@ -40,6 +42,10 @@ public interface BentelerIniVersionMapper extends BaseMapper<BentelerIniVersion>
 
     BentelerIniVersionItem getVersionItem(@Param("versionId") Long versionId);
 
+    List<getNowCheckStatusRes> getNowCheckStatus(@Param("checkStatus") Integer checkStatus);
+
+    List<BentelerIniCheckItem> getVersionCheckItem(@Param("req") GetVersionCheckItemReq req);
+
 
     //BentelerIniVersionItem getPlanCurrentVersionId(@Param("planId") Long planId);
 }

application-facade/src/main/java/com/factory/mapper/ini/BentelerIniWorkstationMapper.java

@@ -0,0 +1,17 @@
+package com.factory.mapper.ini;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.base.entity.po.benteler.BentelerIniWorkstation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-01 13:42:12
+ */
+@Mapper
+public interface BentelerIniWorkstationMapper extends BaseMapper<BentelerIniWorkstation> {
+	
+}

application-facade/src/main/java/com/factory/service/impl/BentelerIniCheckItemServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/ini/BentelerIniCheckItemServiceImpl.java

@@ -1,8 +1,8 @@
-package com.factory.service.impl;
+package com.factory.service.impl.ini;
 
 import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
-import com.factory.service.BentelerIniCheckItemService;
-import com.factory.mapper.BentelerIniCheckItemMapper;
+import com.factory.service.ini.BentelerIniCheckItemService;
+import com.factory.mapper.ini.BentelerIniCheckItemMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

application-facade/src/main/java/com/factory/service/impl/BentelerIniCheckResultServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/ini/BentelerIniCheckResultServiceImpl.java

@@ -1,8 +1,8 @@
-package com.factory.service.impl;
+package com.factory.service.impl.ini;
 
 import com.factory.base.entity.po.benteler.BentelerIniCheckResult;
-import com.factory.service.BentelerIniCheckResultService;
-import com.factory.mapper.BentelerIniCheckResultMapper;
+import com.factory.service.ini.BentelerIniCheckResultService;
+import com.factory.mapper.ini.BentelerIniCheckResultMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

application-facade/src/main/java/com/factory/service/impl/BentelerIniCheckTypeServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/ini/BentelerIniCheckTypeServiceImpl.java

@@ -1,7 +1,7 @@
-package com.factory.service.impl;
+package com.factory.service.impl.ini;
 
-import com.factory.service.BentelerIniCheckTypeService;
-import com.factory.mapper.BentelerIniCheckTypeMapper;
+import com.factory.service.ini.BentelerIniCheckTypeService;
+import com.factory.mapper.ini.BentelerIniCheckTypeMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.benteler.BentelerIniCheckType;
 import org.springframework.stereotype.Service;

application-facade/src/main/java/com/factory/service/impl/BentelerIniVersionItemServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/ini/BentelerIniVersionItemServiceImpl.java

@@ -1,7 +1,7 @@
-package com.factory.service.impl;
+package com.factory.service.impl.ini;
 
-import com.factory.service.BentelerIniVersionItemService;
-import com.factory.mapper.BentelerIniVersionItemMapper;
+import com.factory.service.ini.BentelerIniVersionItemService;
+import com.factory.mapper.ini.BentelerIniVersionItemMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
 import org.springframework.stereotype.Service;

application-facade/src/main/java/com/factory/service/impl/BentelerIniVersionServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/ini/BentelerIniVersionServiceImpl.java

@@ -1,4 +1,4 @@
-package com.factory.service.impl;
+package com.factory.service.impl.ini;
 
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,28 +7,39 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.entity.enumPo.CheckStatus;
+import com.factory.base.entity.enumPo.CheckTypeSubmit;
 import com.factory.base.entity.enumPo.PlanType;
-import com.factory.base.entity.enumPo.VersionAuditStatus;
+import com.factory.base.entity.enumPo.ReviewStatus;
+import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
 import com.factory.base.entity.po.benteler.BentelerIniVersion;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.entity.vo.req.BaseIdReq;
 import com.factory.base.entity.vo.req.BasePageIdReq;
+import com.factory.base.entity.vo.req.BaseTypeReq;
 import com.factory.base.util.res.ResponseBeanBuilder;
-import com.factory.entity.vo.req.*;
-import com.factory.entity.vo.res.benteler.GetVersionBaseRes;
-import com.factory.entity.vo.res.benteler.GetVersionHistoryRes;
-import com.factory.entity.vo.res.benteler.PagePlanRes;
-import com.factory.entity.vo.res.benteler.unAuditListRes;
-import com.factory.mapper.BentelerIniVersionMapper;
-import com.factory.service.BentelerIniVersionItemService;
-import com.factory.service.BentelerIniVersionService;
+import com.factory.entity.vo.req.pad.GetVersionCheckItemReq;
+import com.factory.entity.vo.req.pad.workDetailsReq;
+import com.factory.entity.vo.req.web.*;
+import com.factory.entity.vo.res.pad.ini.getNowCheckStatusRes;
+import com.factory.entity.vo.res.pad.ini.planlistRes;
+import com.factory.entity.vo.res.pad.ini.workDetailsRes;
+import com.factory.entity.vo.res.pad.ini.workTypeDetailsRes;
+import com.factory.entity.vo.res.web.ini.GetVersionBaseRes;
+import com.factory.entity.vo.res.web.ini.GetVersionHistoryRes;
+import com.factory.entity.vo.res.web.ini.PagePlanRes;
+import com.factory.entity.vo.res.web.ini.unAuditListRes;
+import com.factory.mapper.ini.BentelerIniVersionMapper;
+import com.factory.service.ini.BentelerIniCheckResultService;
+import com.factory.service.ini.BentelerIniVersionItemService;
+import com.factory.service.ini.BentelerIniVersionService;
 import com.factory.service.BentelerPlanService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -45,6 +56,8 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
     private BentelerIniVersionService versionService;
     @Autowired
     private BentelerIniVersionItemService versionItemService;
+    @Autowired
+    private BentelerIniCheckResultService checkResultService;
 
     @Override
     public ResponseBean<PageBean<PagePlanRes>> planlist(PlanListReq req) {
@@ -112,7 +125,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
                 .guideDocumentId(req.getGuideDocumentId())
                 .principleOne(principleOne)
                 .principleTwo(principleTwo)
-                .reviewStatus(VersionAuditStatus.待质量经理审核.value)
+                .reviewStatus(ReviewStatus.待质量经理审核.value)
 
                 .checkBegintime(req.getCheckBegintime())
                 .checkEndtime(req.getCheckEndtime())
@@ -232,7 +245,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
             }
         }
         //转换数据库
-        BentelerPlan plan_req = planReq2planPo(req, VersionAuditStatus.待质量经理审核);
+        BentelerPlan plan_req = planReq2planPo(req, ReviewStatus.待质量经理审核);
         BentelerIniVersion version_req = plan_req.getVersion();
         version_req.setPlanId(planId);
         versionService.save(version_req);
@@ -275,7 +288,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         Page<BentelerIniVersion> page = new Page<>(req.getPage(), req.getSize());
         Page<BentelerIniVersion> versionPage = versionService.page(page, Wrappers.<BentelerIniVersion>lambdaQuery()
                 .eq(BentelerIniVersion::getPlanId, planId)
-                .eq(BentelerIniVersion::getReviewStatus, VersionAuditStatus.历史版本.value)
+                .eq(BentelerIniVersion::getReviewStatus, ReviewStatus.历史版本.value)
         );
 
         ResponseBean<PageBean<GetVersionHistoryRes>> ok = ResponseBeanBuilder.ok(versionPage,
@@ -288,8 +301,65 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         return ok;
     }
 
+    @Override
+    public ResponseBean<planlistRes> planPadlist() {
+        List<getNowCheckStatusRes> inifinish = versionMapper.getNowCheckStatus(CheckStatus.首件已完成.value);
+        List<getNowCheckStatusRes> twoFinish = versionMapper.getNowCheckStatus(CheckStatus.两百已完成.value);
+        List<getNowCheckStatusRes> unFinish = versionMapper.getNowCheckStatus(CheckStatus.未完成.value);
+
+
+         planlistRes res = planlistRes.builder()
+                .inifinish(inifinish)
+                .twoFinish(twoFinish)
+                .unFinish(unFinish)
+                .build();
+        return ResponseBeanBuilder.ok(res);
+    }
+
+    @Override
+    public ResponseBean<List<workDetailsRes>> workDetails(BaseTypeReq req) {
+        Long versionId = req.getId();
+        Integer type = req.getType();
+        GetVersionCheckItemReq getVersionCheckItemReq = GetVersionCheckItemReq.builder()
+                .versionId(versionId)
+                .checkType(type)
+                .localDate(LocalDate.now())
+                .build();
+        List<BentelerIniCheckItem> checkItems = versionMapper.getVersionCheckItem( getVersionCheckItemReq);
+        Map<Long, List<BentelerIniCheckItem>> versionItemId_checkItem_map =
+                checkItems.stream().collect(Collectors.groupingBy(BentelerIniCheckItem::getVersionItemId));
+
+        List<workDetailsRes> resList = new ArrayList<>();
+
+        versionItemId_checkItem_map.entrySet().stream().forEach(item->{
+            BentelerIniVersionItem versionitem = versionItemService.getById(item.getKey());
+            boolean allSaveOrSubmit = item.getValue().stream().allMatch(checkItem -> {
+                Integer submitType = checkItem.getSubmitType();
+                return submitType.equals(CheckTypeSubmit.保存.value)||submitType.equals(CheckTypeSubmit.提交.value);
+            });
+            Integer submitType =null;
+            if (allSaveOrSubmit){
+                submitType = 1;
+            }else {
+                submitType = 2;
+            }
+            workDetailsRes res = workDetailsRes.builder()
+                    .workName(versionitem.getWorkstation()+"-"+versionitem.getProductionLine())
+                    .submitType(submitType)
+                    .build();
+            resList.add(res);
+        });
+        return ResponseBeanBuilder.ok(resList);
+    }
+
+    @Override
+    public ResponseBean<workTypeDetailsRes> workTypeDetails(workDetailsReq req) {
+
+        return null;
+    }
+
     //PlanReq转化planPo
-    public BentelerPlan planReq2planPo(AddIniPlanReq req, VersionAuditStatus versionAuditStatus) {
+    public BentelerPlan planReq2planPo(AddIniPlanReq req, ReviewStatus reviewStatus) {
         //计划
         BentelerPlan plan = BentelerPlan.builder()
                 .planType(PlanType.首件.value)
@@ -332,7 +402,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
                 .guideDocumentId(req.getGuideDocumentId())
                 .principleOne(principleOne)
                 .principleTwo(principleTwo)
-                .reviewStatus(versionAuditStatus.value)
+                .reviewStatus(reviewStatus.value)
                 .build();
         //item
         ArrayList<BentelerIniVersionItem> VersionItems = new ArrayList<>();

application-facade/src/main/java/com/factory/service/impl/ini/BentelerIniWorkstationServiceImpl.java

@@ -0,0 +1,19 @@
+package com.factory.service.impl.ini;
+
+import com.factory.base.entity.po.benteler.BentelerIniWorkstation;
+import com.factory.mapper.ini.BentelerIniWorkstationMapper;
+import com.factory.service.ini.BentelerIniWorkstationService;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Service("bentelerIniWorkstationService")
+@Transactional(rollbackFor = Exception.class)
+public class BentelerIniWorkstationServiceImpl extends ServiceImpl<BentelerIniWorkstationMapper, BentelerIniWorkstation> implements BentelerIniWorkstationService {
+
+
+}

application-facade/src/main/java/com/factory/service/BentelerIniCheckItemService.java → application-facade/src/main/java/com/factory/service/ini/BentelerIniCheckItemService.java

@@ -1,4 +1,4 @@
-package com.factory.service;
+package com.factory.service.ini;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniCheckItem;

application-facade/src/main/java/com/factory/service/BentelerIniCheckResultService.java → application-facade/src/main/java/com/factory/service/ini/BentelerIniCheckResultService.java

@@ -1,4 +1,4 @@
-package com.factory.service;
+package com.factory.service.ini;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniCheckResult;

application-facade/src/main/java/com/factory/service/BentelerIniCheckTypeService.java → application-facade/src/main/java/com/factory/service/ini/BentelerIniCheckTypeService.java

@@ -1,4 +1,4 @@
-package com.factory.service;
+package com.factory.service.ini;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniCheckType;

application-facade/src/main/java/com/factory/service/BentelerIniVersionItemService.java → application-facade/src/main/java/com/factory/service/ini/BentelerIniVersionItemService.java

@@ -1,4 +1,4 @@
-package com.factory.service;
+package com.factory.service.ini;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;

application-facade/src/main/java/com/factory/service/BentelerIniVersionService.java → application-facade/src/main/java/com/factory/service/ini/BentelerIniVersionService.java

@@ -1,4 +1,4 @@
-package com.factory.service;
+package com.factory.service.ini;
 
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
@@ -6,13 +6,20 @@ import com.factory.base.entity.po.benteler.BentelerIniVersion;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.vo.req.BaseIdReq;
 import com.factory.base.entity.vo.req.BasePageIdReq;
-import com.factory.entity.vo.req.AddIniPlanReq;
-import com.factory.entity.vo.req.BooleanReq;
-import com.factory.entity.vo.req.PlanListReq;
-import com.factory.entity.vo.res.benteler.GetVersionBaseRes;
-import com.factory.entity.vo.res.benteler.GetVersionHistoryRes;
-import com.factory.entity.vo.res.benteler.PagePlanRes;
-import com.factory.entity.vo.res.benteler.unAuditListRes;
+import com.factory.base.entity.vo.req.BaseTypeReq;
+import com.factory.entity.vo.req.pad.workDetailsReq;
+import com.factory.entity.vo.req.web.AddIniPlanReq;
+import com.factory.entity.vo.req.web.BooleanReq;
+import com.factory.entity.vo.req.web.PlanListReq;
+import com.factory.entity.vo.res.pad.ini.planlistRes;
+import com.factory.entity.vo.res.pad.ini.workDetailsRes;
+import com.factory.entity.vo.res.pad.ini.workTypeDetailsRes;
+import com.factory.entity.vo.res.web.ini.GetVersionBaseRes;
+import com.factory.entity.vo.res.web.ini.GetVersionHistoryRes;
+import com.factory.entity.vo.res.web.ini.PagePlanRes;
+import com.factory.entity.vo.res.web.ini.unAuditListRes;
+
+import java.util.List;
 
 /**
  * 计划 - 版本信息
@@ -42,5 +49,11 @@ public interface BentelerIniVersionService extends IService<BentelerIniVersion>
     ResponseBean<Boolean> getIsUnAuditVersionId(BaseIdReq req);
 
     ResponseBean<PageBean<GetVersionHistoryRes>> historyVersion(BasePageIdReq req);
+
+    ResponseBean<planlistRes> planPadlist();
+
+    ResponseBean<List<workDetailsRes>> workDetails(BaseTypeReq req);
+
+    ResponseBean<workTypeDetailsRes> workTypeDetails(workDetailsReq req);
 }
 

application-facade/src/main/java/com/factory/service/ini/BentelerIniWorkstationService.java

@@ -0,0 +1,18 @@
+package com.factory.service.ini;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.po.benteler.BentelerIniWorkstation;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2021-07-01 13:42:12
+ */
+public interface BentelerIniWorkstationService extends IService<BentelerIniWorkstation> {
+
+}
+

application-facade/src/main/resources/mapper/BentelerIniVersionMapper.xml

@@ -1,7 +1,7 @@
 <?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.factory.mapper.BentelerIniVersionMapper">
+<mapper namespace="com.factory.mapper.ini.BentelerIniVersionMapper">
 
     <sql id="planVersionItem">
         select bp.name,
@@ -15,7 +15,7 @@
                  left join benteler_ini_version_item bivi on biv.id = bivi.version_id
     </sql>
     <!--首件计划列表-->
-    <select id="planlist" resultType="com.factory.entity.vo.res.benteler.PagePlanRes">
+    <select id="planlist" resultType="com.factory.entity.vo.res.web.ini.PagePlanRes">
         select *
         from benteler_plan bp
         left join benteler_ini_version biv on bp.id = biv.plan_id
@@ -39,7 +39,7 @@
 
     </select>
     <!--待审核列表-->
-    <select id="unAuditList" resultType="com.factory.entity.vo.res.benteler.unAuditListRes">
+    <select id="unAuditList" resultType="com.factory.entity.vo.res.web.ini.unAuditListRes">
         select bp.id,
         bp.name,
         bp.plan_type,
@@ -67,8 +67,6 @@
     </select>
 
 
-
-
     <select id="getCurrentVersion" resultMap="rmGetVersion">
         select * from benteler_ini_version biv
         <where>
@@ -99,7 +97,7 @@
         <result column="principle_one" property="principleOne"/>
         <result column="principle_two" property="principleTwo"/>
         <result column="begin_date" property="beginDate"/>
-        <collection select="com.factory.mapper.BentelerIniVersionMapper.getVersionItem"
+        <collection select="com.factory.mapper.ini.BentelerIniVersionMapper.getVersionItem"
                     column="id"
                     javaType="ArrayList"
                     ofType="com.factory.base.entity.po.benteler.BentelerIniVersionItem"
@@ -112,5 +110,43 @@
             and bivi.deleted=0
         </where>
     </select>
+    <select id="getNowCheckStatus" resultType="com.factory.entity.vo.res.pad.ini.getNowCheckStatusRes">
+        select plan.id as planId,
+        plan.name as planName,
+        biv.id as versionId,
+        bicr.id as ResultId,
+        bicr.check_status as checkStatus
+        from benteler_plan plan
+        left join benteler_ini_version biv on plan.id = biv.plan_id and biv.review_status = 2
+        left join benteler_ini_check_result bicr on biv.id = bicr.version_id
+        <where>
+            and plan.pause_flag = 0
+            and bicr.check_status = #{checkStatus}
+        </where>
+    </select>
+    <select id="getVersionCheckItem" resultType="com.factory.base.entity.po.benteler.BentelerIniCheckItem">
+        select *
+        from benteler_ini_version as biv
+        left join benteler_ini_version_item bivi on biv.id = bivi.version_id
+        left join benteler_ini_check_item bici on bivi.id = bici.version_item_id
+        <where>
+            <if test="req.versionId!=null">
+                and biv.id = #{req.versionId}
+            </if>
+            <if test="req.checkType!=null">
+                and bici.check_type = #{req.checkType}
+            </if>
+            <if test="req.localDate!=null">
+                and bici.created_time like concat(#{req.localDate},'%')
+            </if>
+            <if test="req.productionLine!=null and req.productionLine!='' ">
+                and bivi.production_line = #{req.productionLine}
+            </if>
+            <if test="req.workstation!=null and req.workstation!=''">
+                and bivi.workstation = #{req.workstation}
+            </if>
+
+        </where>
+    </select>
 
 </mapper>

application-facade/src/test/java/com/factory/service/impl/BentelerIniVersionServiceImplTest.java

@@ -2,8 +2,7 @@ package com.factory.service.impl;
 
 
 import com.factory.FacadeApplication;
-import com.factory.base.entity.po.benteler.BentelerIniVersion;
-import com.factory.mapper.BentelerIniVersionMapper;
+import com.factory.mapper.ini.BentelerIniVersionMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +22,8 @@ public class BentelerIniVersionServiceImplTest {
     @Test
     public void executeLongdyCreate() {
         //BentelerPlan unAuditPlan = versionMapper.getUnAuditPlan(6L);
+        //GetVersionCheckItemReq req = GetVersionCheckItemReq.builder().build();
+        //versionMapper.getVersionCheckItem(req);
 
     }
 

common-base/src/main/java/com/factory/base/entity/enumPo/CheckStatus.java

@@ -3,7 +3,9 @@ package com.factory.base.entity.enumPo;
 public enum CheckStatus {
 
     未完成(1),
-    已完成(2);
+    首件已完成(2),
+    两百已完成(3),
+    超时(4);
     public final Integer value;
     CheckStatus(Integer value) {
         this.value = value;

common-base/src/main/java/com/factory/base/entity/enumPo/CheckTypeSubmit.java

@@ -2,9 +2,9 @@ package com.factory.base.entity.enumPo;
 
 public enum CheckTypeSubmit {
     //检查单-某一类型的提交状态 1未保存2保存3提交
-    UNSAVE(0),
-    SAVE(1),
-    SUBMIT(2);
+    未保存(0),
+    保存(1),
+    提交(2);
     public final Integer value;
     CheckTypeSubmit(Integer value) {
         this.value = value;

common-base/src/main/java/com/factory/base/entity/enumPo/VersionAuditStatus.java → common-base/src/main/java/com/factory/base/entity/enumPo/ReviewStatus.java

@@ -1,6 +1,6 @@
 package com.factory.base.entity.enumPo;
 
-public enum VersionAuditStatus {
+public enum ReviewStatus {
     //审核结果 1待审核 2当前版本 3历史版本 4驳回
     待质量经理审核(0),
     待生产经理审核(1),
@@ -8,7 +8,7 @@ public enum VersionAuditStatus {
     历史版本(3),
     驳回(4);
     public final Integer value;
-    VersionAuditStatus(Integer value) {
+    ReviewStatus(Integer value) {
         this.value = value;
     }
 

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniCheckItem.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 记录检查结果 - 分类结果 - 单一检查项结果
@@ -46,6 +47,9 @@ public class BentelerIniCheckItem implements Serializable {
     @ApiModelProperty(value = "1首件2二百件3中断")
     private Integer checkType;
 
+    @ApiModelProperty(name = "提交状态 0 未保存 1 保存 2提交")
+    private Integer submitType;
+
     @ApiModelProperty(value = "订单号")
     private String orderId;
 
@@ -72,4 +76,8 @@ public class BentelerIniCheckItem implements Serializable {
     @ApiModelProperty(value = "最近更新时间", hidden = true)
     private LocalDateTime updatedTime;
 
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "具体工位得分", hidden = true)
+    private List<IniGread> checkItems;
 }

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniVersionItem.java

@@ -13,6 +13,7 @@ import java.math.BigDecimal;
 import java.sql.Time;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.List;
 
 /**
  * 计划 - 检查项
@@ -36,6 +37,9 @@ public class BentelerIniVersionItem implements Serializable {
     @ApiModelProperty(value = "计划ID")
     private Long planId;
 
+    @ApiModelProperty(value = "工作站Id")
+    private Long workstationId;
+
     @ApiModelProperty(value = "版本号id")
     private Long versionId;
 
@@ -132,4 +136,11 @@ public class BentelerIniVersionItem implements Serializable {
     @ApiModelProperty(value = "最近更新时间", hidden = true)
     private LocalDateTime updatedTime;
 
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "具体工位得分", hidden = true)
+    private List<BentelerIniCheckItem> checkItems;
+
+
+
 }

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniWorkstation.java

@@ -0,0 +1,69 @@
+package com.factory.base.entity.po.benteler;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author dl
+ * @date 2021-07-01 13:42:12
+ */
+@Data
+@TableName("benteler_ini_workstation")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+public class BentelerIniWorkstation implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "版本id")
+    private Long versionId;
+
+    @ApiModelProperty(value = "生产线")
+    private String productionLine;
+
+    @ApiModelProperty(value = "工作站")
+    private String workstation;
+
+    @ApiModelProperty(value = "保存状态 1 保存 2提交")
+    private Integer status;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "逻辑删除", hidden = true)
+    private Integer deleted;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createdUserId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private LocalDateTime createdTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最近更新人", hidden = true)
+    private Long updatedUserId;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最近更新时间", hidden = true)
+    private LocalDateTime updatedTime;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "点检项", hidden = true)
+	private List<BentelerIniVersionItem> greads;
+
+}

application-facade/src/main/java/com/factory/entity/vo/po/IniGread.java → common-base/src/main/java/com/factory/base/entity/po/benteler/IniGread.java

@@ -1,4 +1,4 @@
-package com.factory.entity.vo.po;
+package com.factory.base.entity.po.benteler;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
@@ -22,5 +22,6 @@ import lombok.NoArgsConstructor;
 public class IniGread {
     private Integer workStation;
     private String gread;
+    private boolean passFlag;
 
 }

common-base/src/main/java/com/factory/base/entity/vo/req/BaseTypeReq.java

@@ -0,0 +1,28 @@
+package com.factory.base.entity.vo.req;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @program: intelligentfactory
+ * @description:
+ * @author: dl
+ * @create: 07月01日 10时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class BaseTypeReq extends BaseIdReq{
+
+    @NotNull(message = "类型 1首件2两百3防错")
+    private Integer type;
+}