Commit 2de64455 zshaohui

单据查询时 如果数据库有 使用数据库中的数据

1 个父辈 5e358363
...@@ -63,7 +63,28 @@ public class TicketController { ...@@ -63,7 +63,28 @@ public class TicketController {
return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"单据号"}); return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"单据号"});
} }
List<FetchMoveTicketResult> ticketList = LuxsanApi.fetchMoveTicket(new FetchMoveTicketRequest(CommonUtil.plantCode, ticket)); List<FetchMoveTicketResult> ticketList = new ArrayList<>();
LiteOrder order = liteOrderCache.getOrderSortItems(ticket);
if (order == null){
ticketList = LuxsanApi.fetchMoveTicket(new FetchMoveTicketRequest(CommonUtil.plantCode, ticket));
} else {
for (LiteOrderItem orderItem : order.getOrderItems()) {
FetchMoveTicketResult result = new FetchMoveTicketResult();
result.setTICKET_ITEM(orderItem.getTicketItem());
result.setMATERIAL_CODE(orderItem.getMaterialCode());
result.setSRC_PLANT(orderItem.getSrcPlant());
result.setDST_PLANT(orderItem.getDstPlant());
result.setSRC_WAREHOUSE(orderItem.getSrcWarehouse());
result.setDST_WAREHOUSE(orderItem.getDstWarehouse());
result.setSRC_BATCH(orderItem.getSrcBatch());
result.setDST_BATCH(orderItem.getDstBatch());
result.setQTY(orderItem.getQty());
result.setMOVE_TYPE(orderItem.getMoveType());
ticketList.add(result);
}
}
return ResultBean.newOkResult(FetchMoveTicketDto.convertFetchMoveTicketDto(ticketList)); return ResultBean.newOkResult(FetchMoveTicketDto.convertFetchMoveTicketDto(ticketList));
} }
...@@ -109,6 +130,16 @@ public class TicketController { ...@@ -109,6 +130,16 @@ public class TicketController {
item.setNeedNum(result.getQTY()); item.setNeedNum(result.getQTY());
item.setWarehouseCode(result.getSRC_WAREHOUSE()); item.setWarehouseCode(result.getSRC_WAREHOUSE());
item.setPn(result.getMATERIAL_CODE()); item.setPn(result.getMATERIAL_CODE());
item.setTicketItem(result.getTICKET_ITEM());
item.setMaterialCode(result.getMATERIAL_CODE());
item.setSrcPlant(result.getSRC_PLANT());
item.setDstPlant(result.getDST_PLANT());
item.setSrcWarehouse(result.getSRC_WAREHOUSE());
item.setDstWarehouse(result.getDST_WAREHOUSE());
item.setSrcBatch(result.getSRC_BATCH());
item.setDstBatch(result.getDST_BATCH());
item.setQty(result.getQTY());
item.setMoveType(result.getMOVE_TYPE());
itemList.add(item); itemList.add(item);
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!