|
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fdkankan.common.constant.Constant;
|
|
import com.fdkankan.common.constant.Constant;
|
|
import com.fdkankan.manage.common.ExcelErrorUtil;
|
|
import com.fdkankan.manage.common.ExcelErrorUtil;
|
|
import com.fdkankan.manage.common.ResultCode;
|
|
import com.fdkankan.manage.common.ResultCode;
|
|
|
|
+import com.fdkankan.manage.entity.Order;
|
|
import com.fdkankan.manage.exception.BusinessException;
|
|
import com.fdkankan.manage.exception.BusinessException;
|
|
import com.fdkankan.common.response.PageInfo;
|
|
import com.fdkankan.common.response.PageInfo;
|
|
import com.fdkankan.common.util.DateUtil;
|
|
import com.fdkankan.common.util.DateUtil;
|
|
@@ -301,6 +302,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+@Autowired
|
|
|
|
+IOrderService orderService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void updateCamera(CameraInOutParam param) {
|
|
public void updateCamera(CameraInOutParam param) {
|
|
@@ -313,12 +316,19 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
}
|
|
}
|
|
if(StringUtils.isNotBlank(param.getCompanyName())){
|
|
if(StringUtils.isNotBlank(param.getCompanyName())){
|
|
Company company = companyService.getCompanyByName(param.getCompanyName());
|
|
Company company = companyService.getCompanyByName(param.getCompanyName());
|
|
- if(company !=null){
|
|
|
|
- cameraDetail.setCompanyId(company.getId());
|
|
|
|
|
|
+ if(company == null){
|
|
|
|
+ throw new BusinessException(ResultCode.COMPANY_NAME_NOT_EXIST);
|
|
}
|
|
}
|
|
|
|
+ cameraDetail.setCompanyId(company.getId());
|
|
|
|
+ }
|
|
|
|
+ if(StringUtils.isNotBlank(param.getOrderSn())){
|
|
|
|
+ Order orderSn = orderService.getByOrderSn(param.getOrderSn());
|
|
|
|
+ if(orderSn == null ){
|
|
|
|
+ throw new BusinessException(ResultCode.ORDER_SN_ERROR);
|
|
|
|
+ }
|
|
|
|
+ cameraDetail.setOrderSn(param.getOrderSn());
|
|
}
|
|
}
|
|
cameraDetail.setOwn(param.getOutType());
|
|
cameraDetail.setOwn(param.getOutType());
|
|
- cameraDetail.setOrderSn(param.getOrderSn());
|
|
|
|
cameraDetailService.updateById(cameraDetail);
|
|
cameraDetailService.updateById(cameraDetail);
|
|
}
|
|
}
|
|
|
|
|