单据复核,单据详情排序问题

fencang
anthonyywj2 3 years ago
parent d6abf1f6f6
commit d062dddb72

@ -355,8 +355,8 @@ public class OrderDetailController {
if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) { if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) {
filterErpOrderRequest.setOrderId("1"); filterErpOrderRequest.setOrderId("1");
} }
filterErpOrderRequest.setPage(1); filterErpOrderRequest.setPage(null);
filterErpOrderRequest.setLimit(100); filterErpOrderRequest.setLimit(null);
List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest); List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId()); OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId());

@ -94,8 +94,12 @@ public class StockOrderDetailController {
} }
StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk()); StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk());
stockOrderDetailFilterRequest.setPage(null);
stockOrderDetailFilterRequest.setLimit(null);
List<StockOrderDetailEntity> stockOrderDetailEntityList List<StockOrderDetailEntity> stockOrderDetailEntityList
= stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) { if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) {

@ -315,6 +315,7 @@
</where> </where>
group by io_codes.id group by io_codes.id
order by io_codes.id
</select> </select>
<select id="selectSupplementOrderList" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity"> <select id="selectSupplementOrderList" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">

Loading…
Cancel
Save