|
|
@ -440,7 +440,7 @@ public class DeviceController {
|
|
|
|
return CommonResult.success(orderVO.getDeviceOrderNo(), "success,订单已上传!");
|
|
|
|
return CommonResult.success(orderVO.getDeviceOrderNo(), "success,订单已上传!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//查询配置
|
|
|
|
//查询配置
|
|
|
|
RecycleDeviceConfig config = configService.getByCompanyId(user.getCompanyId());
|
|
|
|
RecycleDeviceConfig config = configService.getByCompanyId(device.getBeLongCompanyId());
|
|
|
|
String adjustSet = config.getCleanAdjustSet();//审核配置
|
|
|
|
String adjustSet = config.getCleanAdjustSet();//审核配置
|
|
|
|
//查询桶
|
|
|
|
//查询桶
|
|
|
|
|
|
|
|
|
|
|
@ -449,9 +449,15 @@ public class DeviceController {
|
|
|
|
order.setDeviceCode(orderVO.getDeviceCode());
|
|
|
|
order.setDeviceCode(orderVO.getDeviceCode());
|
|
|
|
order.setBucketCode(orderVO.getBucketCode());
|
|
|
|
order.setBucketCode(orderVO.getBucketCode());
|
|
|
|
order.setDoorNum(orderVO.getDoorNum());
|
|
|
|
order.setDoorNum(orderVO.getDoorNum());
|
|
|
|
|
|
|
|
order.setDeviceOrderNo(orderVO.getDeviceOrderNo());
|
|
|
|
order.setProductCode(orderVO.getProductCode());
|
|
|
|
order.setProductCode(orderVO.getProductCode());
|
|
|
|
order.setProductSubCode(orderVO.getProductSubCode());
|
|
|
|
order.setProductSubCode(orderVO.getProductSubCode());
|
|
|
|
order.setPrice(orderVO.getPrice());
|
|
|
|
order.setPrice(orderVO.getPrice());
|
|
|
|
|
|
|
|
order.setWeight(orderVO.getTotalWeight());
|
|
|
|
|
|
|
|
order.setTotalPrice(orderVO.getTotalPrice());
|
|
|
|
|
|
|
|
order.setCleanUserId(orderVO.getUserId());
|
|
|
|
|
|
|
|
order.setPhone(orderVO.getPhone());
|
|
|
|
|
|
|
|
order.setBagNo(orderVO.getBagNo());
|
|
|
|
List<Snap> images = orderVO.getImages();
|
|
|
|
List<Snap> images = orderVO.getImages();
|
|
|
|
if (images == null || images.size() == 0) {
|
|
|
|
if (images == null || images.size() == 0) {
|
|
|
|
throw new BizIllegalException("上传失败:未上传抓拍图片!!");
|
|
|
|
throw new BizIllegalException("上传失败:未上传抓拍图片!!");
|
|
|
@ -472,6 +478,7 @@ public class DeviceController {
|
|
|
|
order.setAdjustComm("");
|
|
|
|
order.setAdjustComm("");
|
|
|
|
order.setAdjustWeight(BigDecimal.ZERO);
|
|
|
|
order.setAdjustWeight(BigDecimal.ZERO);
|
|
|
|
order.setAdjustPrice(BigDecimal.ZERO);
|
|
|
|
order.setAdjustPrice(BigDecimal.ZERO);
|
|
|
|
|
|
|
|
order.setEntryStatus(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StrUtil.isNotEmpty(orderVO.getStartTime())) {
|
|
|
|
if (StrUtil.isNotEmpty(orderVO.getStartTime())) {
|
|
|
|
order.setStartTime(DateUtil.parse(orderVO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
order.setStartTime(DateUtil.parse(orderVO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
@ -486,7 +493,7 @@ public class DeviceController {
|
|
|
|
order.setCreatorUserId(orderVO.getUserId());
|
|
|
|
order.setCreatorUserId(orderVO.getUserId());
|
|
|
|
order.setCreatorTime(new Date());
|
|
|
|
order.setCreatorTime(new Date());
|
|
|
|
order.setPhone(orderVO.getPhone());
|
|
|
|
order.setPhone(orderVO.getPhone());
|
|
|
|
order.setCompanyId(user.getCompanyId());
|
|
|
|
order.setCompanyId(device.getBeLongCompanyId());
|
|
|
|
cleanOrderService.save(order);
|
|
|
|
cleanOrderService.save(order);
|
|
|
|
return CommonResult.success(orderVO.getDeviceOrderNo());
|
|
|
|
return CommonResult.success(orderVO.getDeviceOrderNo());
|
|
|
|
}
|
|
|
|
}
|
|
|
|