出库领料,sortNum

platform-dao/src/main/java/com/platform/dao/dto/fill/FillGatherDTO.java

@@ -95,6 +95,8 @@ public class FillGatherDTO extends BaseDTO implements Serializable {
      */
     private List<String> infoIds;
 
+    private List<Integer> sortNums;
+
     /**
      * 频次周期（天）
      */

platform-dao/src/main/java/com/platform/dao/dto/fill/FillGatherTaskDTO.java

@@ -123,6 +123,8 @@ public class FillGatherTaskDTO extends BaseDTO implements Serializable {
      */
     private List<String> sbIds;
 
+    private List<Integer> sortNums;
+
     /**
      * 暂停类型 1 暂停 2 取消暂停
      */

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreDetailDTO.java

@@ -23,6 +23,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailDTO extends BaseDTO implements Serializable {
+    private String repairFormId;//关联维修工单
 
     private Integer autoId;
     /**

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreFormDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormDTO extends BaseDTO implements Serializable {
+    private String repairFormId;//关联维修工单
 
     private String applyDept;// 申请部门编码和用友oa保持一致
     private String applyUser;

platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -20,6 +20,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_sb_info")
 @Data
 public class SbInfo implements Serializable {
+    private Integer sortNum;
     /**
      * 自定义参数列表
      */

platform-dao/src/main/java/com/platform/dao/entity/store/OutStoreDetail.java

@@ -17,7 +17,7 @@ import javax.persistence.Transient;
 /**
  * @Description 出库详情实体类
  * @Author liuyu
- * @Date 2020-06-09 10:38:52
+ * @Date 2020-06-09 10:38:52n
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
@@ -25,6 +25,8 @@ import javax.persistence.Transient;
 @Table(name = "t_out_store_detail")
 public class OutStoreDetail implements Serializable {
 
+    private String repairFormId;//关联维修工单
+
     private Integer autoId;
     /**
      * 主键

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -176,6 +176,9 @@ public class ExportSbInfoVO implements Serializable {
 
     @Excel(name="安装位置")
     private String cph;
+
+    @Excel(name="排序字段")
+    private String sortNum;
     /**
      * 介质
      */

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -25,6 +25,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoVO extends BaseVO implements Serializable {
+    private String sortNum;
     /**
      * 自定义参数列表:[{name:name1, content:content1},{name:name2, content:content2}]
      */

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -172,7 +172,7 @@ sb.apply_time,
                                      sb.remark,
                                      sb.apply_comment,
 sb.scrap_user_id,
-sb.scrap_user_name,sb.repair_dept_id
+sb.scrap_user_name,sb.repair_dept_id,sb.sort_num
     </sql>
 
     <sql id="deptSql">

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -107,7 +107,7 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         // 1、获取巡检内容
         String content = getContentByGatherId(model.getGatherId());
         // 2、根据设备IDs，生成内容列表并保存
-        saveDetails(content,model.getSbIds(),task.getId());
+        saveDetails(content,model.getSbIds(),model.getSortNums(),task.getId());
         // 3、通知相关人员（巡检人和主管）
         sendMessageToChecker(task,1);
         sendMessageToChecker(task,2);
@@ -373,21 +373,35 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
      * @param sbIds
      * @param taskId
      */
-    private void saveDetails(String content,List<String> sbIds,String taskId){
+    private void saveDetails(String content,List<String> sbIds,List<Integer> sortNums,String taskId){
         List<FillGatherTaskDetail> details = new ArrayList<>();
-        for(String sbId : sbIds){
+        for(int i=0;i<sbIds.size();i++){
             FillGatherTaskDetail detail = new FillGatherTaskDetail();
             detail.setContent(content);
             detail.setCreatedTime(LocalDateTime.now());
             detail.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
             detail.setCreatedUserName(SecurityUtils.getUserInfo().getUsername());
-            detail.setSbId(sbId);
+            detail.setSbId(sbIds.get(i));
+            detail.setSortNum(sortNums.get(i));
             detail.setTaskId(taskId);
             detail.setId(IdGeneratorUtils.getObjectId());
             detail.setStatus(0);
             detail.setSortNum(100);
             details.add(detail);
         }
+//        for(String sbId : sbIds){
+//            FillGatherTaskDetail detail = new FillGatherTaskDetail();
+//            detail.setContent(content);
+//            detail.setCreatedTime(LocalDateTime.now());
+//            detail.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
+//            detail.setCreatedUserName(SecurityUtils.getUserInfo().getUsername());
+//            detail.setSbId(sbId);
+//            detail.setTaskId(taskId);
+//            detail.setId(IdGeneratorUtils.getObjectId());
+//            detail.setStatus(0);
+//            detail.setSortNum(100);
+//            details.add(detail);
+//        }
         fillGatherTaskDetailMapper.insertListforComplex(details);
     }
 }

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -284,6 +284,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         OutStoreForm outStoreForm = super.saveModelByDTO(model);
         // 插
         for (OutStoreDetailDTO detail : detailList) {
+            detail.setRepairFormId(model.getRepairFormId());
             detail.setUserInfo(userInfo);
             detail.setOutId(outStoreForm.getId());
             detail.setRealNum(detail.getNum());