1.补录单据查询接口返回当前仓库和分库名称,查询语句增加相关字段

fencang
x_z 3 years ago
parent 737b0462ff
commit 3604a30d54

@ -116,8 +116,6 @@ public class OrderController {
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/error")
public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) {
// orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
// orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId()));
if (StringUtils.isBlank(orderFilterRequest.getCustomerId()))
return ResultVOUtils.success();
@ -130,7 +128,6 @@ public class OrderController {
}
orderFilterRequest.setCustomerId(null);
// List<OrderEntity> orderEntityList = orderService.filterListOr(orderFilterRequest);
List<OrderEntity> orderEntityList = orderService.filterList(orderFilterRequest);
PageInfo<OrderEntity> pageInfo;
pageInfo = new PageInfo<>(orderEntityList);

@ -120,4 +120,5 @@ public interface OrderService {
* @param responseList
*/
void queryInvName(List<StockOrderResponse> responseList);
}

@ -286,7 +286,10 @@
<select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT io_order.* FROM io_order
SELECT io_order.* ,
inv_warehouse.name as invName,
inv_warehouse_sub.name as subInvName
FROM io_order
LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`

Loading…
Cancel
Save