diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index e201cdb28..c786e01b7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -448,7 +448,7 @@ public class IoCodeTempController extends BaseController { long recent = 0; if (udiRelevanceResponse.getRecentDateTime() != null) recent = udiRelevanceResponse.getRecentDateTime().longValue(); - if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()&& udiRelevanceResponse.getIsDateBy()==2) { + if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 2) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = MsDateUtil.parseDateExpire(expireDate); @@ -456,7 +456,7 @@ public class IoCodeTempController extends BaseController { long resultTime = expireTime - System.currentTimeMillis(); if (resultTime > 0) { - long time = resultTime / ( 60 * 60 * 1000); + long time = resultTime / (60 * 60 * 1000); // long time = resultTime / (24 * 60 * 60 * 1000); if (resultTime < recentTieme) { return ResultVOUtils.error(505, "当前产品临近过期,距过期还剩" + time + "时,是否确定继续添加?"); @@ -465,7 +465,7 @@ public class IoCodeTempController extends BaseController { } } - if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy()==1) { + if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 1) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = MsDateUtil.parseDateExpire(expireDate); @@ -1258,5 +1258,18 @@ public class IoCodeTempController extends BaseController { else return ResultVOUtils.error(500, "修改失败!"); } + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/checkTempCode") + public BaseResponse checkTempCode(@RequestBody IoCodeTempEntity codeTempEntity) { + + Boolean falg=codeTempService.checkTempCode(codeTempEntity); + if(!falg){ + return ResultVOUtils.error(999,"该产品已存在,请勿重复录入"); + } + + return ResultVOUtils.success(); + + } + } diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index c77a3386e..7eacccda2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -45,4 +45,6 @@ public interface IoCodeTempService { boolean isExit(String orderId); Integer selectExitCount(String orderId, String bacthNo, Long relId, String supId); + + Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index 5a787ae76..203a38007 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -113,4 +113,21 @@ public class IoCodeTempServiceImpl implements IoCodeTempService { return ioCodeTempDao.selectExitCount(filterCodeRequest); } + @Override + public Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity) { + + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",ioCodeTempEntity.getCode()); + ew.eq("corpOrderId",ioCodeTempEntity.getCorpOrderId()); + ew.eq("batchNo",ioCodeTempEntity.getBatchNo()); + ew.eq("produceDate",ioCodeTempEntity.getProduceDate()); + ew.eq("expireDate",ioCodeTempEntity.getExpireDate()); + ew.eq("serialNo",ioCodeTempEntity.getSerialNo()); + Long count = ioCodeTempDao.selectCount(ew); + if(count>0){ + return false; + } + return true; + } + }