柜锁 终端调整

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/AioCabinetLockVo.java

@@ -44,6 +44,9 @@ public class AioCabinetLockVo {
     @ApiModelProperty(value = "操作时长（单位分）")
     private Integer operateTime;
 
+    @ApiModelProperty(value = "出入库ID")
+    private Long stockId;
+
     public Long getId() {
         return id;
     }
@@ -131,4 +134,12 @@ public class AioCabinetLockVo {
     public void setLockLogId(Long lockLogId) {
         this.lockLogId = lockLogId;
     }
+
+    public Long getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(Long stockId) {
+        this.stockId = stockId;
+    }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpCabinetServiceImpl.java

@@ -266,6 +266,10 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
             result = hxpCabinetMapper.selectByJoinId(aioCabinetLockVo.getJoinId());
         }
 
+        if(result == null){
+            throw new ServiceException("未查询到柜锁设置，操作失败！");
+        }
+
         boolean success = false;
         String closeLockVideo = null;
         if (type == 1) {
@@ -314,16 +318,24 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
                 HxpCabinetlockLog hxpCabinetlockLog = cabinetlockLogMapper.selectHxpCabinetlockLogById(aioCabinetLockVo.getLockLogId());
                 result.setLockLogId(aioCabinetLockVo.getLockLogId());
                 if(hxpCabinetlockLog != null){
+                    if(LockTypeEnum.IN_STOCK.equals(aioCabinetLockVo.getLockType()) && aioCabinetLockVo.getStockId() != null){
+                        logger.info("关锁绑定入库ID：" + aioCabinetLockVo.getStockId());
+                        hxpCabinetlockLog.setStockId(aioCabinetLockVo.getStockId());
+                    }
                     hxpCabinetlockLog.setCloseLockTime(DateUtils.getNowDate());
                     hxpCabinetlockLog.setCloseLockVideo(closeLockVideo);
                     cabinetlockLogService.updateHxpCabinetlockLog(hxpCabinetlockLog);
                 }else {
                     logger.error("柜锁关闭修改操作记录失败：" + aioCabinetLockVo.getSubId() + "---------" + result.getLockId());
                 }
+
+
             }
         }
 
 
+
+
         result.setSuccess(success);
 
         return result;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSubjectVO.java

@@ -99,7 +99,7 @@ public class LabSubjectVO extends LabSubject {
     private String adminNameAndPhone;
 
     @ApiModelProperty(value = "化学品临界值危险指标")
-    private String riskIndicator = "暂无化学品";
+    private String riskIndicator = "无化学品";
 
     public LabSubjectVO() {
     }