仪表优化

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -27,6 +27,11 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoDTO extends BaseDTO implements Serializable {
+    /**
+     * 报废日期
+     */
+    private LocalDateTime scrapedDate;
+
     private String oldPositionId;//原设备位置 (老设备位置选择设备后自动带出了，新设备位置，让用户自己选择）
 
     private String newPositionId;//新设备位置

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

@@ -20,6 +20,10 @@ import java.time.LocalDateTime;
 @Table(name = "t_sb_info")
 @Data
 public class SbInfo implements Serializable {
+    /**
+     * 报废日期
+     */
+    private LocalDateTime scrapedDate;
     @Transient
     private String positionName;
     /**

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

@@ -0,0 +1,42 @@
+package com.platform.dao.vo.export.sb;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Description 点检标准导出VO
+ * @Author liuyu
+ * @Date 2020-05-28 17:23:30
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportSbMeasureLogVO3 implements Serializable {
+
+
+    @Excel(name = "仪表位号")
+    private String positionNo;
+    /**
+     * 标准名称
+     */
+    @Excel(name = "检定时间")
+    private LocalDate lastDate;
+    /**
+     * 编码
+     */
+    @Excel(name = "校准单位")
+    private String requirement;
+
+    @Excel(name = "检定单号")
+    private String no;
+
+
+
+
+
+}

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

@@ -28,6 +28,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoVO extends BaseVO implements Serializable {
+    /**
+     * 报废日期
+     */
+    private LocalDateTime scrapedDate;
     private List<SysFile> sbMeasureLogCredential;//设备变动凭证
     private List<SbMeasureLogVO> subSbMeasureLogVO;
     private String exceptionDescription;

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -63,6 +63,15 @@ public class SbInfoController {
     private final FillGatherTaskService fillGatherTaskService;
     private final SbMeasureLogService sbMeasureLogService;
     private final SbTypeService sbTypeService;
+
+    @SysLog("仪表批量退库")
+    @PutMapping("/yiBiao/batch/back-store")
+    //@PreAuthorize("@pms.hasPermission('sb-infos-edit')")
+    public R yiBiaoBatchBackStore(SbInfoDTO sbInfoDTO) {
+        sbInfoService.yiBiaoBatchBackStore(sbInfoDTO);
+        return new R<>();
+    }
+
     /**
      * 设备工作台数据
      *

platform-rest/src/main/java/com/platform/rest/controller/sb/SbMeasureLogController.java

@@ -19,8 +19,10 @@ import com.platform.dao.enums.SbMeasureLogOtherTypeEnum;
 import com.platform.dao.enums.SysFileTypeEnum;
 import com.platform.dao.mapper.sb.SbUpdateLogMapper;
 import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.sb.ExportSbInfoVO;
 import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO;
 import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO2;
+import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO3;
 import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.dao.vo.sb.SbUpdateLogVO;
 import com.platform.rest.log.annotation.SysLog;
@@ -29,8 +31,10 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -96,6 +100,16 @@ public class SbMeasureLogController {
         return new R<>();
     }
 
+    @SysLog("通过模板导入批量新增设备计量记录")
+    @PostMapping("/template/longYan/batch")
+    public R saveByTemplateLongYanBatch(@RequestParam("file") MultipartFile file) throws IOException {
+        List<SbMeasureLogDTO> list = BeanConverterUtil.copyListProperties(ExcelUtil.importExcel(file.getInputStream(), ExportSbMeasureLogVO3.class, 1),SbMeasureLogDTO.class);
+        BatchSbMeasureLog batchSbMeasureLog = new BatchSbMeasureLog();
+        batchSbMeasureLog.setSbMeasureLogDTOList(list);
+        sbMeasureLogService.saveBatchMeasureLog(batchSbMeasureLog);
+        return new R<>();
+    }
+
     @SysLog("批量设备在库")
     @PostMapping("/longYan/in/batch")
     public R inLongYanBatch(@RequestBody BatchSbMeasureLog batchSbMeasureLog) {

platform-service/src/main/java/com/platform/service/sb/SbInfoService.java

@@ -26,6 +26,7 @@ import java.util.Map;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
+    void yiBiaoBatchBackStore(SbInfoDTO sbInfoDTO);
     AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbModelSpareBomDTO dto, Integer pageNum, Integer pageSize);
 
     AbstractPageResultBean<YiBiaoHisroryVO> getPositionNoHistory(SbChangeRecordDTO dto,Integer pageNum,Integer pageSize);

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -67,6 +67,7 @@ import com.platform.service.check.CheckStandardService;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.part.PartInfoService;
 import com.platform.service.sb.SbInfoService;
+import com.platform.service.sb.SbMeasureLogService;
 import com.platform.service.sb.SbModelSpareBomService;
 import com.platform.service.upms.SysConfigService;
 import com.platform.service.upms.SysDeptService;
@@ -140,6 +141,44 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     private final FillGatherTaskDetailMapper fillGatherTaskDetailMapper;
     private final SbMeasureLogMapper sbMeasureLogMapper;
 
+
+    @Override
+    public void yiBiaoBatchBackStore(SbInfoDTO sbInfoDTO) {
+        //批量退库到‘仪表二级库’
+        if (sbInfoDTO.getSbIds()!=null && sbInfoDTO.getSbIds().size()>0){
+            SbInfo udpSb = new SbInfo();
+            UserInfo userInfo = SecurityUtils.getUserInfo();
+            sbInfoDTO.getSbIds().forEach(item->{
+                udpSb.setId(item);
+                udpSb.setPositionId("658d2817a6cf000dacd41698");
+//                udpSb.setStatus(SbInfoStatusEnum.IN_BACK.getValue());
+                if (sbInfoDTO.getStatus() == SbInfoStatusEnum.SCRAPED.getValue()) {
+                    udpSb.setScrapedDate(LocalDateTime.now());
+                }
+                mapper.updateByPrimaryKeySelective(udpSb);
+                //记录操作记录
+                SbMeasureLog log = new SbMeasureLog();
+                log.setSbId(item);
+                log.setId(IdGeneratorUtils.getObjectId());
+                if (sbInfoDTO.getStatus() == SbInfoStatusEnum.IN_BACK.getValue()) {
+                    log.setOtherType(SbMeasureLogOtherTypeEnum.IN_STORE.getValue());
+                }
+                if (sbInfoDTO.getStatus() == SbInfoStatusEnum.SCRAPED.getValue()) {
+                    log.setOtherType(SbMeasureLogOtherTypeEnum.BAO_FEI.getValue());
+                }
+                log.setContent(sbInfoDTO.getRemark());
+                log.setCreatedTime(LocalDateTime.now());
+                log.setCreatedUserId(userInfo.getUserId());
+                log.setCreatedUserName(userInfo.getRealName());
+                log.setUpdateTime(LocalDateTime.now());
+                log.setUpdateUserId(userInfo.getUserId());
+                log.setUpdateUserName(userInfo.getRealName());
+                sbMeasureLogMapper.insert(log);
+
+            });
+        }
+    }
+
     @Override
     public AbstractPageResultBean<SbInfoVO> getSynchronousSb(SbModelSpareBomDTO dto,Integer pageNum,Integer pageSize) {
 //        SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();

platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -650,6 +650,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         }
     }
 
+
     @Override
     public void saveBatchIn(BatchSbMeasureLog batchSbMeasureLog) {
         if (batchSbMeasureLog.getSbMeasureLogDTOList() != null && batchSbMeasureLog.getSbMeasureLogDTOList().size() > 0) {

platform-service/src/main/java/handler/yongyou/BaseRequestHandler.java

@@ -145,7 +145,7 @@ public abstract class BaseRequestHandler {
         log.info("用友请求参数：" + requestData);
         String resStr = HttpUtil.post(url, requestData);
         try {
-            //log.info("用友中心响应数据---"+resStr);
+            log.info("用友中心响应数据---"+resStr);
         } catch (Exception e) {
             throw new Exception("响应失败:" + e);
         }