Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BBomVersionInfoMapper.xml

@@ -12,6 +12,7 @@
         <result column="bom_id" jdbcType="BIGINT" property="bomId"/>
         <result column="no" jdbcType="VARCHAR" property="no"/>
         <result column="version" jdbcType="VARCHAR" property="version"/>
+        <result column="source" jdbcType="VARCHAR" property="source"/>
         <result column="use_status" jdbcType="VARCHAR" property="useStatus"/>
         <result column="audit_status" jdbcType="VARCHAR" property="auditStatus"/>
         <result column="audit_user" jdbcType="BIGINT" property="auditUser"/>
@@ -23,7 +24,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        bom_id, no, version, use_status, audit_status, audit_user, audit_user_name, create_user_name, remark
+        bom_id, no, version, source, use_status, audit_status, audit_user, audit_user_name, create_user_name, remark
     </sql>
 
 
@@ -33,6 +34,7 @@
         pv.id procedureId,
         b. NAME bomName,
         bv.version,
+        bv.source,
         pv. NO procedureNo,
         r. NAME resourceName,
         r.id resourceId,

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/InspectionController.java

@@ -105,10 +105,10 @@ public class InspectionController extends SuperController<InspectionService, Lon
         LbqWrapper<TTask> taskLbqWrapper = new LbqWrapper<TTask>();
         taskLbqWrapper.eq(TTask::getCompleteBatchNo, workPiece.getCompleteBatchNo()).eq(TTask::getPlanId, map.get("planId").toString()).in(TTask::getProcedureId, idList.toArray());
 
-        Inspection inspection = baseService.getOne(new LbqWrapper<Inspection>().eq(Inspection::getWorkpieceId, workPiece.getId()));
+        List<Long> taskIds = baseService.list(new LbqWrapper<Inspection>().eq(Inspection::getWorkpieceId, workPiece.getId())).stream().map(item->item.getTaskId()).collect(Collectors.toList());
         //排除已经提交抽检的工序
-        if (null != inspection && null != inspection.getTaskId()) {
-            taskLbqWrapper.ne(TTask::getId, inspection.getTaskId());
+        if (null != taskIds && taskIds.size()>0) {
+            taskLbqWrapper.notIn(TTask::getId, taskIds.toArray());
         }
         List<TTask> dataList = taskService.list(taskLbqWrapper);
         return success(dataList);

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomVersionInfoPageDTO.java

@@ -96,4 +96,11 @@ public class BBomVersionInfoPageDTO implements Serializable {
     @Length(max = 256, message = "备注长度不能超过256")
     private String remark;
 
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "版本来源(1-系统内2-系统外)")
+    @Length(max = 4, message = "版本来源(1-系统内2-系统外)长度不能超过4")
+    private String source;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomVersionInfoSaveDTO.java

@@ -95,4 +95,11 @@ public class BBomVersionInfoSaveDTO implements Serializable {
     @Length(max = 256, message = "备注长度不能超过256")
     private String remark;
 
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "版本来源(1-系统内2-系统外)")
+    @Length(max = 4, message = "版本来源(1-系统内2-系统外)长度不能超过4")
+    private String source;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomVersionInfoUpdateDTO.java

@@ -99,4 +99,11 @@ public class BBomVersionInfoUpdateDTO implements Serializable {
     @ApiModelProperty(value = "备注")
     @Length(max = 256, message = "备注长度不能超过256")
     private String remark;
+
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "版本来源(1-系统内2-系统外)")
+    @Length(max = 4, message = "版本来源(1-系统内2-系统外)长度不能超过4")
+    private String source;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BomVersionInfoSaveDTO.java

@@ -95,4 +95,11 @@ public class BomVersionInfoSaveDTO implements Serializable {
     @Length(max = 256, message = "备注长度不能超过256")
     private String remark;
 
+    /**
+     * 来源
+     */
+    @ApiModelProperty(value = "版本来源(1-系统内2-系统外)")
+    @Length(max = 4, message = "版本来源(1-系统内2-系统外)长度不能超过4")
+    private String source;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomVersionInfo.java

@@ -73,6 +73,15 @@ public class BomVersionInfo extends Entity<Long> {
     @Excel(name = "版本号")
     private String version;
 
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本来源(1-系统内2-系统外)")
+    @Length(max = 4, message = "版本来源(1-系统内2-系统外)长度不能超过4")
+    @TableField(value = "source", condition = LIKE)
+    @Excel(name = "版本来源(1-系统内2-系统外)")
+    private String source;
+
     /**
      * 使用状态(1-已使用0-未使用)
      */