导出

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairSchemeDTO.java

@@ -101,4 +101,5 @@ public class RepairSchemeDTO extends BaseDTO implements Serializable {
     private String errorTypeId; // 异常类别
 
     private String errorContent; // 故障描述
+
 }

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

@@ -168,4 +168,6 @@ public class OutStoreFormDTO extends BaseDTO implements Serializable {
     private Integer printFlag;
 
     private List<Integer> statusList;
+
+    private List<String> ids;
 }

platform-dao/src/main/java/com/platform/dao/mapper/store/OutStoreFormMapper.java

@@ -23,6 +23,7 @@ import java.util.List;
  */
 @Component
 public interface OutStoreFormMapper extends MyMapper<OutStoreForm> {
+    List<OutStoreFormVO> selectLists(OutStoreFormDTO dto);
 
     BigDecimal getOutStoreFormCount1(OutStoreFormDTO outStoreFormDTO);
 

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportOutStoreFormVO.java

@@ -77,5 +77,31 @@ public class ExportOutStoreFormVO implements Serializable {
   @Excel(name = "更新日期", orderNum = "10")
   private LocalDateTime updateTime;
 
+  /**
+   * 更新人
+   */
+  @Excel(name = "备件名称", orderNum = "11")
+  private String spareName;
+
+  /**
+   * 更新人
+   */
+  @Excel(name = "规格", orderNum = "12")
+  private String ggxh;
+
+  /**
+   * 更新人
+   */
+  @Excel(name = "单位", orderNum = "13")
+  private String unit;
+
+  /**
+   * 更新人
+   */
+  @Excel(name = "数量", orderNum = "14")
+  private String realNum;
+
+  @Excel(name = "出库单备注", orderNum = "15")
+  private String remark2;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreFormVO.java

@@ -133,4 +133,10 @@ public class OutStoreFormVO extends BaseVO implements Serializable {
     private String weekDayName; // 日期
 
     private Integer totalNum; // 出库总数
+
+    private String ggxh;
+
+    private String unit;
+
+    private BigDecimal realNum;
 }

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -284,4 +284,19 @@ outstoreform.process_instance_id,
         </where>
     </select>
 
+    <select id="selectLists" resultType="com.platform.dao.vo.query.store.OutStoreFormVO"
+            parameterType="com.platform.dao.dto.store.OutStoreFormDTO">
+        SELECT * FROM t_out_store_form form JOIN t_out_store_detail detail ON
+        form.id=detail.`out_id`
+        <where>
+            <if test="ids!=null and ids.size>0">
+            and form.id in
+                <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/store/OutStoreFormController.java

@@ -188,7 +188,13 @@ public class OutStoreFormController {
     @SysLog("出库登记单导出")
     @PreAuthorize("@pms.hasPermission('store-out-store-forms-export')")
     public void export(HttpServletResponse response, OutStoreFormDTO outStoreFormDTO) {
-        List<OutStoreForm> list = outStoreFormService.getModelListByDTO(outStoreFormDTO);
+//        List<String> ids = outStoreFormDTO.getIds();
+//        if (ids!=null&&ids.size()>0){
+//            for (String id:ids){
+//
+//            }
+//        }
+        List<OutStoreFormVO> list = outStoreFormService.selectLists(outStoreFormDTO);
         ExcelUtil.exportResponseDict(response, ExportOutStoreFormVO.class, BeanConverterUtil.copyListProperties(list, ExportOutStoreFormVO.class), "出库登记单");
     }
 

platform-service/src/main/java/com/platform/service/store/OutStoreFormService.java

@@ -20,6 +20,13 @@ import java.util.List;
  */
 public interface OutStoreFormService extends IBaseService<OutStoreForm, OutStoreFormDTO> {
 
+    List<OutStoreFormVO> selectLists(OutStoreFormDTO dto);
+
+    /**
+     * 出库单关联备件详情查询
+     */
+
+
     /**
      * 批量删除
      *

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

@@ -66,6 +66,11 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private SbInfoMapper sbInfoMapper;
     private SbPositionMapper sbPositionMapper;
 
+    @Override
+    public List<OutStoreFormVO> selectLists(OutStoreFormDTO dto) {
+        return mapper.selectLists(dto);
+    }
+
     @Override
     public int batchDelete(List<String> ids) {
         //Weekend<OutStoreForm> weekend = new Weekend<>(OutStoreForm.class);