diff --git a/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java b/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java index 763eb074..e8de0a99 100644 --- a/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java +++ b/core/common/src/main/java/cn/qihangerp/request/OrderSearchRequest.java @@ -6,6 +6,7 @@ import lombok.Data; public class OrderSearchRequest { private Long shopId; private Integer shopType; + private Integer shipType; private String orderNum; private String orderStatus; private String startTime; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java index 556b9d7b..2edb4e26 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java @@ -50,38 +50,45 @@ public class OrderController extends BaseController { return success(orderService.queryDetailById(id)); } - /** - * 推送订单到ERP - * @param ids + * 待发货列表（去除处理过的） + * @param order + * @param pageQuery * @return */ - @PostMapping("/pushErp/{ids}") - public AjaxResult pushErp(@PathVariable Long[] ids) { -// for (Long id : ids) { -// OOrder oOrder = orderService.getById(id); -// if (oOrder != null) { -// oOrder.setItemList(orderItemService.getOrderItemListByOrderId(id)); -// ResultVo resultVo = erpPushHelper.pushOrderSingle(oOrder); -// OOrder pushUpdate = new OOrder(); -// if (oOrder.getOrderStatus() == 1 || oOrder.getOrderStatus() == 2 || oOrder.getOrderStatus() == 3) { -// // 待发货、已发货、已完成 订单推送 -// pushUpdate.setErpPushStatus(resultVo.getCode() == 0 ? 200 : resultVo.getCode()); -// -// } else if (oOrder.getOrderStatus() == 11) { -// pushUpdate.setErpPushStatus(resultVo.getCode() == 0 ? 100 : resultVo.getCode());//推送状态200 订单推送成功 100 取消订单推送成功 -// } -// pushUpdate.setErpPushResult(resultVo.getMsg()); -// pushUpdate.setErpPushTime(new Date()); -// pushUpdate.setUpdateBy("手动推送到ERP"); -// pushUpdate.setUpdateTime(new Date()); -// pushUpdate.setId(id.toString()); -// orderService.updateById(pushUpdate); -// } -// } - - return success(); + @GetMapping("/waitShipmentList") + public TableDataInfo waitShipmentList(OrderSearchRequest order, PageQuery pageQuery) + { + var pageList = orderService.queryWaitShipmentPageList(order,pageQuery); + return getDataTable(pageList); } + /** + * 已分配供应商发货列表 + * @param order + * @param pageQuery + * @return + */ + @GetMapping("/assignedShipmentList") + public TableDataInfo assignedShipmentList(OrderSearchRequest order, PageQuery pageQuery) + { + var pageList = orderService.queryAssignedShipmentList(order,pageQuery); + return getDataTable(pageList); + } + + /** + * 已发货列表 + * @param order + * @param pageQuery + * @return + */ + @GetMapping("/shippedList") + public TableDataInfo shippedList(OrderSearchRequest order, PageQuery pageQuery) + { + var pageList = orderService.queryShippedPageList(order,pageQuery); + return getDataTable(pageList); + } + + // @PostMapping // public AjaxResult add(@RequestBody OrderCreateBo order) // { diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java index 27981b4d..79d4249a 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java @@ -31,6 +31,31 @@ public interface OOrderService extends IService { ResultVo offlineOrderMessage(String orderNum); ResultVo weiOrderMessage(String orderNum,JSONObject orderDetail ); + /** + * 获取待发货list（去除处理过的） + * @param bo + * @param pageQuery + * @return + */ + PageResult queryWaitShipmentPageList(OrderSearchRequest bo, PageQuery pageQuery); + + /** + * 获取已分配发货的list + * @param bo + * @param pageQuery + * @return + */ + PageResult queryAssignedShipmentList(OrderSearchRequest bo, PageQuery pageQuery); + + + /** + * 已经发货的list + * @param bo + * @param pageQuery + * @return + */ + PageResult queryShippedPageList(OrderSearchRequest bo, PageQuery pageQuery); + List getList(OOrder order); PageResult queryPageList(OrderSearchRequest bo, PageQuery pageQuery); diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index 50254ffc..677138c5 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -1325,6 +1325,109 @@ public class OOrderServiceImpl extends ServiceImpl } } } + /** + * 获取待发货list（去除处理过的） + * @param bo + * @param pageQuery + * @return + */ + @Override + public PageResult queryWaitShipmentPageList(OrderSearchRequest bo, PageQuery pageQuery) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(bo.getShopId()!=null,OOrder::getShopId,bo.getShopId()) + .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType()) + .eq(OOrder::getOrderStatus,1) + .eq(OOrder::getRefundStatus,1) + .eq(OOrder::getShipStatus,0)//发货状态 0 待发货 1 已分配供应商发货 2全部发货 +// .lt(ErpOrder::getShipType,2)//ship_type发货方式 0 自己发货1联合发货2供应商发货 + .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime()) + .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime()) + .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum()) + ; + Page pages = orderMapper.selectPage(pageQuery.build(), queryWrapper); + + // 查询子订单 + if(pages.getRecords()!=null){ + for (OOrder order:pages.getRecords()) { + order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper() + .eq(OOrderItem::getOrderId, order.getId()) + .eq(OOrderItem::getShipStatus,0) +// .eq(ErpOrderItem::getShipType,0) + )); + } + } + + return PageResult.build(pages); + } + + /** + * 查询分配给供应商发货的订单list + * @param bo + * @param pageQuery + * @return + */ + @Override + public PageResult queryAssignedShipmentList(OrderSearchRequest bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(bo.getShopId()!=null,OOrder::getShopId,bo.getShopId()) + .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType()) + .ne(OOrder::getShipper,0)//ship_type发货方 0 自己发货1联合发货2供应商发货 + .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime()) + .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime()) + .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum()) + ; + Page pages = orderMapper.selectPage(pageQuery.build(), queryWrapper); + + // 查询子订单 + if(pages.getRecords()!=null){ + for (OOrder order:pages.getRecords()) { + order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper() + .eq(OOrderItem::getOrderId, order.getId()) + .ne(OOrderItem::getShipper,0) + )); +// order.setShipmentList(shipmentMapper.selectList(new LambdaQueryWrapper().eq(ErpShipment::getOrderId,order.getId()))); + } + } + + return PageResult.build(pages); + + } + + /** + * 已经发货的list（去除分配给供应商发货的） + * @param bo + * @param pageQuery + * @return + */ + @Override + public PageResult queryShippedPageList(OrderSearchRequest bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + + .eq(bo.getShopId()!=null,OOrder::getShopId,bo.getShopId()) + .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType()) + .eq(bo.getShipType()!=null,OOrder::getShipType,bo.getShipType()) + .eq(OOrder::getShipStatus,2)//发货状态 0 待发货 1 已分配供应商发货 2全部发货 + + .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime()) + .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime()) + .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum()) + ; + Page pages = orderMapper.selectPage(pageQuery.build(), queryWrapper); + + // 查询子订单 + if(pages.getRecords()!=null){ + for (OOrder order:pages.getRecords()) { + order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper() + .eq(OOrderItem::getOrderId, order.getId()) + .eq(OOrderItem::getShipStatus,2) + )); +// order.setShipmentList(shipmentMapper.selectList(new LambdaQueryWrapper().eq(ErpShipment::getOrderId,order.getId()))); + } + } + + return PageResult.build(pages); + } @Override public List getList(OOrder order) { diff --git a/vue/src/api/order/order.js b/vue/src/api/order/order.js index 9054c043..4e27acdf 100644 --- a/vue/src/api/order/order.js +++ b/vue/src/api/order/order.js @@ -34,7 +34,30 @@ export function updateErpSkuId(data) { }) } - +// 查询待自己发货的订单列表（待发货的） +export function waitSelfShipmentList(query) { + return request({ + url: '/api/oms-api/order/waitShipmentList', + method: 'get', + params: query + }) +} +// 查询已分配给供应商发货的订单 +export function assignedShipmentList(query) { + return request({ + url: '/api/oms-api/order/assignedShipmentList', + method: 'get', + params: query + }) +} +// 查询己发货的订单列表(已发货的) +export function selfShippedList(query) { + return request({ + url: '/api/oms-api/order/shippedList', + method: 'get', + params: query + }) +} // 分配供应商发货 export function allocateShipmentOrder(data) { diff --git a/vue/src/views/shipping/shipment/assigned_list.vue b/vue/src/views/shipping/shipment/assigned_list.vue index 8de9aade..6438fd96 100644 --- a/vue/src/views/shipping/shipment/assigned_list.vue +++ b/vue/src/views/shipping/shipment/assigned_list.vue @@ -94,7 +94,7 @@ - +