|
|
@ -620,10 +620,16 @@ public class TradeuploadController {
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
tradeuploadCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
tradeuploadCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
|
|
|
|
//判断磅单号
|
|
|
|
TradeuploadEntity entity = JsonUtil.getJsonToBean(tradeuploadCrForm, TradeuploadEntity.class);
|
|
|
|
TradeuploadEntity entity = JsonUtil.getJsonToBean(tradeuploadCrForm, TradeuploadEntity.class);
|
|
|
|
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getPoundlistNo())){
|
|
|
|
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isBlank(entity.getPoundlistNo())){
|
|
|
|
return ActionResult.fail("磅单号不能为空");
|
|
|
|
return ActionResult.fail("磅单号不能为空");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//判断#号
|
|
|
|
|
|
|
|
boolean flag = entity.getPoundlistNo().contains("#");
|
|
|
|
|
|
|
|
if (flag==true){
|
|
|
|
|
|
|
|
return ActionResult.fail("磅单号存在特殊字符#号,请修改");
|
|
|
|
|
|
|
|
}
|
|
|
|
QueryWrapper<TradeuploadEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<TradeuploadEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(TradeuploadEntity::getPoundlistNo, entity.getPoundlistNo());
|
|
|
|
queryWrapper.lambda().eq(TradeuploadEntity::getPoundlistNo, entity.getPoundlistNo());
|
|
|
|
List<TradeuploadEntity> list = tradeuploadService.list(queryWrapper);
|
|
|
|
List<TradeuploadEntity> list = tradeuploadService.list(queryWrapper);
|
|
|
|