|
@@ -19,6 +19,7 @@ import com.fdkankan.manage.vo.request.CameraInOutParam;
|
|
|
import com.fdkankan.manage.vo.request.CameraParam;
|
|
|
import com.fdkankan.manage.vo.response.CameraDataVo;
|
|
|
import com.fdkankan.manage.vo.response.CameraDetailVo;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -36,6 +37,7 @@ import java.util.stream.Collectors;
|
|
|
* @since 2022-06-16
|
|
|
*/
|
|
|
@Service
|
|
|
+@Slf4j
|
|
|
public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implements ICameraService {
|
|
|
|
|
|
@Autowired
|
|
@@ -54,8 +56,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
|
ICompanyService companyService;
|
|
|
@Autowired
|
|
|
IExcelService excelService;
|
|
|
- @Value("${fyun.type}")
|
|
|
- private String ossType;
|
|
|
+ @Autowired
|
|
|
+ IOrderService orderService;
|
|
|
|
|
|
@Override
|
|
|
public List<Camera> getListByCameraIdList(List<Long> cameraIdList) {
|
|
@@ -279,6 +281,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
|
continue;
|
|
|
}
|
|
|
if(!dbOrderSn.contains(sn)){
|
|
|
+ log.error("outError-->出库错误:snCode不存在:snCode:{}",sn);
|
|
|
errorList.add(index);
|
|
|
}
|
|
|
}
|
|
@@ -336,8 +339,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
|
|
|
|
}
|
|
|
|
|
|
-@Autowired
|
|
|
-IOrderService orderService;
|
|
|
|
|
|
@Override
|
|
|
public void updateCamera(CameraInOutParam param) {
|
|
@@ -420,6 +421,8 @@ IOrderService orderService;
|
|
|
index ++;
|
|
|
if(StringUtils.isNotBlank(companyParam.getCompanyName())){
|
|
|
if(companyNameMap.get(companyParam.getCompanyName()) == null){
|
|
|
+ log.error("outError-->出库错误:客户名称不存在:snCode:{},outType:{},companyName:{},orderSn:{},agentName:{}"
|
|
|
+ ,companyParam.getSnCode(),companyParam.getOutType(),companyParam.getCompanyName(),companyParam.getOrderSn(),companyParam.getAgentId());
|
|
|
errorList.add(index);
|
|
|
}
|
|
|
companyParam.setCompanyId(companyNameMap.get(companyParam.getCompanyName()));
|