|
|
@ -840,7 +840,7 @@ public class OrderController {
|
|
|
|
orderBean.setInvWarehouseCode(unitMaintainPlatform.getInvSubCode());
|
|
|
|
orderBean.setInvWarehouseCode(unitMaintainPlatform.getInvSubCode());
|
|
|
|
orderBean.setCorpOrderId(stockOrder.getBillNo());
|
|
|
|
orderBean.setCorpOrderId(stockOrder.getBillNo());
|
|
|
|
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
|
|
|
|
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
|
|
|
|
warehouseQueryRequest.setOrderId(stockOrder.getBillNo());
|
|
|
|
warehouseQueryRequest.setOrderId(stockOrder.getOrderIdFk());
|
|
|
|
List<WarehouseEntity> warehouseEntities = codesService.findByOrderId(warehouseQueryRequest);
|
|
|
|
List<WarehouseEntity> warehouseEntities = codesService.findByOrderId(warehouseQueryRequest);
|
|
|
|
List<PostUdimsOrderRequest.OrderBean.CodeBean> codeBeans = new ArrayList<>();
|
|
|
|
List<PostUdimsOrderRequest.OrderBean.CodeBean> codeBeans = new ArrayList<>();
|
|
|
|
warehouseEntities.forEach(data -> {
|
|
|
|
warehouseEntities.forEach(data -> {
|
|
|
@ -854,7 +854,7 @@ public class OrderController {
|
|
|
|
FilterOrderDetailRequest filterOrderDetailRequest = new FilterOrderDetailRequest();
|
|
|
|
FilterOrderDetailRequest filterOrderDetailRequest = new FilterOrderDetailRequest();
|
|
|
|
filterOrderDetailRequest.setOrderId(orderBean.getOrderId());
|
|
|
|
filterOrderDetailRequest.setOrderId(orderBean.getOrderId());
|
|
|
|
//查询业务单据详情
|
|
|
|
//查询业务单据详情
|
|
|
|
List<StockOrderDetailEntity> orderDetailList = stockOrderDetailService.findByScanOrderId(orderBean.getOrderId());
|
|
|
|
List<StockOrderDetailEntity> orderDetailList = stockOrderDetailService.findByOrderIdFk(stockOrder.getId());
|
|
|
|
if (CollUtil.isNotEmpty(orderDetailList)) {
|
|
|
|
if (CollUtil.isNotEmpty(orderDetailList)) {
|
|
|
|
List<PostUdimsOrderDetailRequest> orderDetails = new ArrayList<>();
|
|
|
|
List<PostUdimsOrderDetailRequest> orderDetails = new ArrayList<>();
|
|
|
|
for (StockOrderDetailEntity stockOrderDetailEntity : orderDetailList) {
|
|
|
|
for (StockOrderDetailEntity stockOrderDetailEntity : orderDetailList) {
|
|
|
|