feat: 内网拉取外网单据

panjc_field_management
chenhc 9 months ago
parent 7d4e190b05
commit 4d4e4e8760

@ -179,45 +179,47 @@ public class IoCodeTempController extends BaseController {
if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) { if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) {
collectOrder = collectOrderService.unionSearch(null, null, code); collectOrder = collectOrderService.unionSearch(null, null, code);
//=============================================// //=============================================//
if (collectOrder == null) { if (collectOrder != null) {
BaseResponse response = ResultVOUtils.error(501, "查无此单据号,先选择要处理的单据"); collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
response.setData(code); collectOrder.setBusType(addEnterCodeRequest.getBusType());
IoCollectOrder ioCollectOrder = new IoCollectOrder();
BeanUtils.copyProperties(collectOrder, ioCollectOrder);
collectOrderService.updateById(ioCollectOrder);
BaseResponse response = ResultVOUtils.error(601, code);
response.setData(collectOrder);
return response; return response;
} } else {
collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode()); BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest);
collectOrder.setBusType(addEnterCodeRequest.getBusType()); if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) {
IoCollectOrder ioCollectOrder = new IoCollectOrder(); collectOrder = collectOrderService.unionSearch(null, null, code);
BeanUtils.copyProperties(collectOrder, ioCollectOrder); //=============================================//
collectOrderService.updateById(ioCollectOrder); if (collectOrder != null) {
collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
BaseResponse response = ResultVOUtils.error(601, code); collectOrder.setBusType(addEnterCodeRequest.getBusType());
response.setData(collectOrder); IoCollectOrder ioCollectOrder = new IoCollectOrder();
return response; BeanUtils.copyProperties(collectOrder, ioCollectOrder);
} else { collectOrderService.updateById(ioCollectOrder);
BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest); BaseResponse response = ResultVOUtils.error(601, code);
if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) { response.setData(collectOrder);
collectOrder = collectOrderService.unionSearch(null, null, code); return response;
//=============================================// }
if (collectOrder != null) {
collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
collectOrder.setBusType(addEnterCodeRequest.getBusType());
IoCollectOrder ioCollectOrder = new IoCollectOrder();
BeanUtils.copyProperties(collectOrder, ioCollectOrder);
collectOrderService.updateById(ioCollectOrder);
BaseResponse response = ResultVOUtils.error(601, code);
response.setData(collectOrder);
return response;
} }
} }
BaseResponse response = ResultVOUtils.error(501, baseResponse.getMessage()); BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据");
response.setData(code); response.setData(code);
return response; return response;
} }
} else {
}else {
BaseResponse response = ResultVOUtils.error(601, code); BaseResponse response = ResultVOUtils.error(601, code);
response.setData(collectOrder); response.setData(collectOrder);
return response; return response;
} }
BaseResponse response = ResultVOUtils.error(501, "未找到匹配单据");
response.setData(collectOrder);
return response;
} }
//前端扫码完整性校验 //前端扫码完整性校验

Loading…
Cancel
Save