|
|
|
@ -517,6 +517,48 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* PDA获取待校验、待配货等单据
|
|
|
|
|
*
|
|
|
|
|
* @param filterOrderRequest
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/inout/order/pda/download")
|
|
|
|
|
public BaseResponse pdaFilterOrder(FilterOrderRequest filterOrderRequest) {
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isEmpty(filterOrderRequest.getBillNo())) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据号不能为空!");
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
|
|
|
|
|
orderService.setFilterStatus(filterOrderRequest);
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
|
|
|
|
|
orderService.setActions(filterOrderRequest);
|
|
|
|
|
//要是不存在要查询的单据类型就直接放回空
|
|
|
|
|
if (CollUtil.isEmpty(filterOrderRequest.getActions())) {
|
|
|
|
|
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
|
|
|
|
|
return ResultVOUtils.page(pageInfo);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
String customerId = getCustomerId();
|
|
|
|
|
if (!customerId.equals("110")) {
|
|
|
|
|
filterOrderRequest.setFromCorp(customerId);
|
|
|
|
|
}
|
|
|
|
|
List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
|
|
|
|
|
if (CollUtil.isEmpty(list))
|
|
|
|
|
return ResultVOUtils.error(500, "未查询到单据");
|
|
|
|
|
FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
|
|
|
|
|
filterOrderDetailBizRequest.setOrderIdFk(filterOrderRequest.getBillNo());
|
|
|
|
|
List<IoOrderDetailBizResponse> orderDetailBizResponses = orderDetailBizService.filterList(filterOrderDetailBizRequest);
|
|
|
|
|
IoOrderPdaResponse orderPdaResponse = new IoOrderPdaResponse();
|
|
|
|
|
orderPdaResponse.setOrderResponse(list.get(0));
|
|
|
|
|
orderPdaResponse.setOrderDetailBizResponses(orderDetailBizResponses);
|
|
|
|
|
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
|
|
|
|
|
return ResultVOUtils.page(pageInfo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<IoCodeTempEntity> getOtherCode(String billNo, List<IoCodeTempEntity> codeEntities) {
|
|
|
|
|
List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(billNo);
|
|
|
|
|
|
|
|
|
|