Skip to content

J
jiedao-api-boot-master
Commit fc6e0344 authored by honghy's avatar honghy
Browse files
Options

控货详情列表

parent c98688c7
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 72 deletions
sql/v2.3/20241120hhy.sql
View file @ fc6e0344
...@@ -138,35 +138,5 @@ INSERT INTO `jiedao`.`system_dict_data`(`sort`, `label`, `value`, `dict_type`, ` ...@@ -138,35 +138,5 @@ INSERT INTO `jiedao`.`system_dict_data`(`sort`, `label`, `value`, `dict_type`, `
--客户操作日志类型 --客户操作日志类型
INSERT INTO `jiedao`.`system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`, `label_fr`) VALUES (34, '验证码发送', '34', 'customer_operate_type', 0, 'default', '', NULL, '2741', '2024-12-13 14:05:59', '2741', '2024-12-13 14:05:59', b'0', 'Verification code', 'CAPTCHA'); INSERT INTO `jiedao`.`system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`, `label_fr`) VALUES (34, '验证码发送', '34', 'customer_operate_type', 0, 'default', '', NULL, '2741', '2024-12-13 14:05:59', '2741', '2024-12-13 14:05:59', b'0', 'Verification code', 'CAPTCHA');
--控货详情列表
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('air-shipment-warehouse', 1, 3, 1, 0, '0', 0, 51, NULL, NULL, NULL, '2740', '2024-11-14 15:17:49', '2740', '2024-11-15 09:45:52', b'0'); INSERT INTO `jiedao`.`system_menu`(`name`, `permission`, `menu_type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `is_show_in_menu_bar`, `name_en`, `keepalive`, `redirect`, `badge_field`) VALUES ('控货详情列表', '', 2, 7, 1559, 'cargo_control/detail_list', 'component', 'ecw/order/cargoControlDetailList', 0, '2741', '2024-12-16 14:01:21', '2741', '2024-12-20 09:35:58', b'0', b'1', 'Control Details', b'0', NULL, NULL);
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('air-shipment-warehouse', 1, 3, 0, 0, '0', 0, 50, NULL, NULL, NULL, '2740', '2024-11-14 15:17:36', '2740', '2024-11-15 09:45:44', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('warehouse-in', 1, 3, 0, 0, '0', 0, 47, NULL, NULL, NULL, '2740', '2024-11-13 17:11:09', '2740', '2024-11-13 17:11:09', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('warehouse-in-control', 1, 3, 0, 0, '0', 0, 46, NULL, NULL, NULL, '2740', '2024-11-13 17:10:40', '2740', '2024-11-13 17:10:40', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('warehouse-in-append', 1, 3, 0, 0, '0', 0, 65, NULL, NULL, NULL, '2740', '2024-11-13 17:09:51', '2740', '2024-11-13 17:09:51', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('warehouse-in-collect-of-goods', 1, 1, 0, 0, '0', 0, 41, NULL, NULL, NULL, '2740', '2024-11-13 10:50:18', '2740', '2024-11-13 10:50:18', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('warehouse-in-append', 1, 1, 0, 0, '0', 0, 34, NULL, NULL, NULL, '2740', '2024-11-13 10:49:47', '2740', '2024-11-13 10:49:47', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('warehouse-in', 1, 1, 0, 0, '0', 0, 32, NULL, NULL, NULL, '2740', '2024-11-13 10:48:58', '2740', '2024-11-19 14:17:19', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('warehouse-in-control', 1, 1, 0, 0, '0', 0, 31, NULL, NULL, NULL, '2740', '2024-11-13 10:48:36', '2740', '2024-11-13 10:48:36', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-close-container', 1, 1, 0, 0, '0', 0, 39, NULL, NULL, NULL, '2740', '2024-11-13 10:48:08', '2740', '2024-11-13 10:48:08', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-cabinet', 1, 3, 1, 0, '0', 0, 64, NULL, NULL, NULL, '2740', '2024-11-13 10:29:02', '2740', '2024-11-13 10:29:02', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-cabinet', 1, 3, 0, 0, '0', 0, 63, NULL, NULL, NULL, '2740', '2024-11-13 10:28:48', '2740', '2024-11-13 10:28:48', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-cabinet', 1, 1, 1, 0, '0', 0, 21, NULL, NULL, NULL, '2740', '2024-11-13 10:09:37', '2740', '2024-11-13 10:09:37', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-cabinet', 1, 1, 0, 0, '0', 0, 45, NULL, NULL, NULL, '2740', '2024-11-13 10:09:04', '2740', '2024-11-13 10:09:04', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-customs-clearance', 1, 3, 1, 0, '0', 0, 53, NULL, NULL, NULL, '2740', '2024-11-13 10:07:59', '2740', '2024-11-13 10:07:59', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-customs-clearance', 1, 3, 0, 0, '0', 0, 52, NULL, NULL, NULL, '2740', '2024-11-13 10:07:46', '2740', '2024-11-13 10:07:46', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-customs-clearance', 1, 1, 1, 0, '0', 0, 23, NULL, NULL, NULL, '2740', '2024-11-13 10:02:56', '2740', '2024-11-13 10:02:56', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-customs-clearance', 1, 1, 0, 0, '0', 0, 43, NULL, NULL, NULL, '2740', '2024-11-13 10:02:41', '2740', '2024-11-13 10:02:41', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-arrival', 1, 3, 1, 0, '0', 0, 49, NULL, NULL, NULL, '2740', '2024-11-13 09:58:16', '2740', '2024-11-13 09:58:16', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-arrival', 1, 3, 0, 0, '0', 0, 48, NULL, NULL, NULL, '2740', '2024-11-13 09:58:02', '2740', '2024-11-13 09:58:02', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-arrival', 1, 1, 1, 0, '0', 0, 22, NULL, NULL, NULL, '2740', '2024-11-13 09:57:40', '2740', '2024-11-13 09:57:40', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('shipment-arrival', 1, 1, 0, 0, '0', 0, 44, NULL, NULL, NULL, '2740', '2024-11-13 09:57:12', '2740', '2024-11-13 09:57:23', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('notification-successful-cancel-delivery', 0, 0, 0, 0, '0', 0, 42, NULL, NULL, NULL, '2740', '2024-11-12 11:13:47', '2740', '2024-11-12 17:53:38', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('notification-successful-delivery', 0, 0, 0, 0, '0', 0, 36, NULL, NULL, NULL, '2740', '2024-11-12 11:09:38', '2740', '2024-11-12 17:53:49', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('delivery-verification-sms', 0, 0, 0, 0, '0', 0, 38, NULL, NULL, NULL, '2740', '2024-11-08 16:16:21', '2740', '2024-11-08 16:16:21', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('transfer-control-goods', 0, 0, 0, 0, '0', 0, 37, NULL, NULL, NULL, '2740', '2024-11-08 15:50:53', '2740', '2024-11-08 15:50:53', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('user-sms-update-mobile', 0, 0, 0, 0, '0', 0, 16, NULL, NULL, NULL, '2740', '2024-11-08 15:00:45', '2740', '2024-11-08 15:00:45', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('user-sms-reset-password', 0, 0, 0, 0, '0', 0, 15, NULL, NULL, NULL, '2740', '2024-11-08 14:18:49', '2740', '2024-11-08 14:18:49', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('user-sms-login', 0, 0, 0, 0, '0', 0, 14, 60, NULL, NULL, '2740', '2024-11-06 14:16:31', '2740', '2024-11-11 15:11:03', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('user-sms-reg', 0, 0, 0, 0, '0', 0, 13, 59, NULL, NULL, '2740', '2024-11-05 15:00:37', '2740', '2024-11-08 13:59:18', b'0');
INSERT INTO `jiedao`.`system_sms_node`(`node_value`, `is_transport`, `transport_id`, `is_orders`, `country_id`, `country_code`, `status`, `template_id_one`, `template_id_two`, `template_id_three`, `template_id_four`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('user-sms-redeem-reward', 0, 0, 0, 0, '0', 0, 55, NULL, NULL, NULL, '2740', '2024-11-20 09:54:21', '2740', '2024-11-20 09:54:21', b'0');
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderCargoControlPick/OrderCargoControlPickMapper.java
View file @ fc6e0344
...@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO; ...@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControlPick.OrderCargoControlPickDO; import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControlPick.OrderCargoControlPickDO;
import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto; import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickBackVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickBackVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
...@@ -162,8 +163,19 @@ public interface OrderCargoControlPickMapper extends AbstractMapper<OrderCargoCo ...@@ -162,8 +163,19 @@ public interface OrderCargoControlPickMapper extends AbstractMapper<OrderCargoCo
@Select("SELECT IFNULL(a.num,0) FROM (select SUM(pick_num) as num FROM ecw_order_cargo_control_pick where order_id = #{orderId} and status in(3,4)) as a ") @Select("SELECT IFNULL(a.num,0) FROM (select SUM(pick_num) as num FROM ecw_order_cargo_control_pick where order_id = #{orderId} and status in(3,4)) as a ")
int getPickNumByOrderId(@Param("orderId") Long orderId); int getPickNumByOrderId(@Param("orderId") Long orderId);
long orderDetailListCount(@Param("query") OrderQueryVO query); /**
控货订单详情列表数量
*/
long orderCargoControlDetailListCount(@Param("query") OrderQueryVO query);
List<OrderCargoControlReleaseInfoDto> orderDetailList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query, /**
控货订单详情列表
*/
List<OrderCargoControlReleaseInfoDto> orderCargoControlDetailList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query,
@Param("sort") String sort); @Param("sort") String sort);
/**
* 查询控货订单列表统计
*/
StatisticsOrderVO statisticsOrderControl(@Param("query") OrderQueryVO query);
} }
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControlPick/OrderCargoControlPickService.java
View file @ fc6e0344
...@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO; ...@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControlPick.OrderCargoControlPickDO; import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControlPick.OrderCargoControlPickDO;
import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto; import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO;
...@@ -155,8 +156,13 @@ public interface OrderCargoControlPickService extends IService<OrderCargoControl ...@@ -155,8 +156,13 @@ public interface OrderCargoControlPickService extends IService<OrderCargoControl
*/ */
void cancelApprovalByOrderApprovalId(Long orderApprovalId, String reason); void cancelApprovalByOrderApprovalId(Long orderApprovalId, String reason);
/* /**
控货订单详情列表 控货订单详情列表
*/ */
PageResult<OrderCargoControlReleaseInfoDto> orderDetailList(OrderQueryVO query, PageVO page); PageResult<OrderCargoControlReleaseInfoDto> orderCargoControlDetailList(OrderQueryVO query, PageVO page);
/**
* 查询控货订单列表统计
*/
StatisticsOrderVO statisticsOrderControl(OrderQueryVO query);
} }
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControlPick/OrderCargoControlPickServiceImpl.java
View file @ fc6e0344
...@@ -45,6 +45,7 @@ import cn.iocoder.yudao.module.order.service.order.OrderService; ...@@ -45,6 +45,7 @@ import cn.iocoder.yudao.module.order.service.order.OrderService;
import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService; import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService;
import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO; import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO;
...@@ -1471,14 +1472,13 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo ...@@ -1471,14 +1472,13 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
bpmCreateServiceFactory.cancelBmpById(userId, approvalDO.getFormId(), reason); bpmCreateServiceFactory.cancelBmpById(userId, approvalDO.getFormId(), reason);
} }
/* /**
控货订单详情列表 控货订单详情列表
*/ */
@Override @Override
public PageResult<OrderCargoControlReleaseInfoDto> orderDetailList(OrderQueryVO query, PageVO page) { public PageResult<OrderCargoControlReleaseInfoDto> orderCargoControlDetailList(OrderQueryVO query, PageVO page) {
query.setLang(I18nMessage.getLang());
IPage<OrderCargoControlReleaseInfoDto> mpPage = MyBatisUtils.buildPage(page); IPage<OrderCargoControlReleaseInfoDto> mpPage = MyBatisUtils.buildPage(page);
long total = orderCargoControlPickMapper.orderDetailListCount(query); long total = orderCargoControlPickMapper.orderCargoControlDetailListCount(query);
int start = (page.getPage() - 1) * page.getRows(); int start = (page.getPage() - 1) * page.getRows();
int size = page.getRows(); int size = page.getRows();
String sort = null; String sort = null;
...@@ -1490,8 +1490,16 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo ...@@ -1490,8 +1490,16 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
sort= CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, field) + " " + (reversed?"DESC":"ASC"); sort= CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, field) + " " + (reversed?"DESC":"ASC");
} }
List<OrderCargoControlReleaseInfoDto> list = List<OrderCargoControlReleaseInfoDto> list =
orderCargoControlPickMapper.orderDetailList(start, size, query,sort); orderCargoControlPickMapper.orderCargoControlDetailList(start, size, query,sort);
return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize()); return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
} }
/**
* 查询控货订单列表统计
*/
@Override
public StatisticsOrderVO statisticsOrderControl(OrderQueryVO query) {
return orderCargoControlPickMapper.statisticsOrderControl(query);
}
} }
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/orderCargoControlPick/OrderCargoControlPickMapper.xml
View file @ fc6e0344
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.order.dal.mysql.orderCargoControlPick.OrderCargoControlPickMapper"> <mapper namespace="cn.iocoder.yudao.module.order.dal.mysql.orderCargoControlPick.OrderCargoControlPickMapper">
<select id="orderDetailListCount" resultType="java.lang.Long"> <select id="orderCargoControlDetailListCount" resultType="java.lang.Long">
SELECT count(1) SELECT count(1)
FROM ecw_order_cargo_control_pick occ FROM ecw_order_cargo_control_pick occ
JOIN ecw_order o on o.order_id = occ.order_id JOIN ecw_order o on o.order_id = occ.order_id
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<include refid="query"/> <include refid="query"/>
</select> </select>
<select id="orderDetailList" <select id="orderCargoControlDetailList"
resultType="cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto"> resultType="cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto">
SELECT o.order_no, SELECT o.order_no,
o.order_id, o.order_id,
...@@ -66,11 +66,29 @@ ...@@ -66,11 +66,29 @@
limit #{start}, #{size} limit #{start}, #{size}
</select> </select>
<select id="statisticsOrderControl" resultType="cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO">
SELECT sum(occ.pick_num) as totalNum,
sum(occ.pick_volume) as totalVolume,
sum(truncate(ceil((occ.pick_num/round(o.sum_num*occ.pick_volume,5))*100)/100,2)) as totalChargeVolume,
sum(occ.pick_weight) as totalWeight,
sum(truncate(ceil((occ.pick_num/round(o.sum_num*occ.pick_weight,5))*100)/100,2)) as totalChargeWeight
FROM ecw_order_cargo_control_pick occ
JOIN ecw_order o on o.order_id = occ.order_id
LEFT JOIN ecw_order_consignor nor ON nor.order_id = o.order_id AND nor.deleted = 0
LEFT JOIN ecw_order_consignee nee ON nee.order_id = o.order_id AND nee.deleted = 0
LEFT JOIN ecw_warehouse_line ewl on ewl.id = o.line_id
LEFT JOIN ecw_warehouse ew_start ON ew_start.id = ewl.start_warehouse_id
LEFT JOIN ecw_warehouse ew_dest ON ew_dest.id = ewl.dest_warehouse_id
LEFT JOIN ecw_channel ec on ec.channel_id = o.channel_id
<include refid="query"/>
and occ.status = 3
</select>
<sql id="query"> <sql id="query">
<where> <where>
<!--订单号--> <!--订单号-->
<if test="query.numberKey != null and query.numberKey != '' "> <if test="query.numberKey != null and query.numberKey != '' ">
AND o.order_no like concat("%",concat(#{query.numberKey},"%")) AND o.order_no like concat("%",#{query.numberKey},"%")
</if> </if>
<if test="query.eqNumberKey != null and query.eqNumberKey != '' "> <if test="query.eqNumberKey != null and query.eqNumberKey != '' ">
AND o.order_no = #{query.eqNumberKey} AND o.order_no = #{query.eqNumberKey}
...@@ -79,51 +97,54 @@ ...@@ -79,51 +97,54 @@
AND o.order_no != #{query.notEqNumberKey} AND o.order_no != #{query.notEqNumberKey}
</if> </if>
<if test="query.notNumberKey != null and query.notNumberKey != '' "> <if test="query.notNumberKey != null and query.notNumberKey != '' ">
AND o.order_no not like concat("%",concat(#{query.notNumberKey},"%")) AND o.order_no not like concat("%",#{query.notNumberKey},"%")
</if> </if>
<!--提单号--> <!--提单号-->
<if test="query.prodKey != null and query.prodKey != '' "> <if test="query.prodKey != null and query.prodKey != '' ">
AND occ.tidanNo like concat("%",concat(#{query.prodKe},"%")) AND occ.tidan_No like concat("%",#{query.prodKey},"%")
</if> </if>
<if test="query.eqProdKey != null and query.eqProdKey != '' "> <if test="query.eqProdKey != null and query.eqProdKey != '' ">
AND occ.tidanNo = #{query.eqProdKey} AND occ.tidan_No = #{query.eqProdKey}
</if> </if>
<if test="query.notEqProdKey != null and query.notEqProdKey != '' "> <if test="query.notEqProdKey != null and query.notEqProdKey != '' ">
AND occ.tidanNo != #{query.notEqProdKey} AND occ.tidan_No != #{query.notEqProdKey}
</if> </if>
<if test="query.notNumberKey != null and query.notNumberKey != '' "> <if test="query.notProdKey != null and query.notProdKey != '' ">
AND occ.tidanNo not like concat("%",concat(#{query.notNumberKey},"%")) AND occ.tidan_No not like concat("%",#{query.notProdKey},"%")
</if> </if>
<!--发货人--> <!--发货人-->
<if test="query.consignorKey != null and query.consignorKey != '' "> <if test="query.consignorKey != null and query.consignorKey != '' ">
AND (nor.name like concat("%",concat(#{query.consignorKey},"%")) or AND (nor.name like concat("%",#{query.consignorKey},"%") or
nor.phone like concat("%",concat(#{query.consignorKey},"%")) nor.phone like concat("%",#{query.consignorKey},"%") or
nor.customer_number like concat("%",concat(#{query.consignorKey},"%")) ) nor.customer_number like concat("%",#{query.consignorKey},"%") )
</if> </if>
<!--收货人--> <!--收货人-->
<if test="query.consigneeKey != null and query.consigneeKey != '' "> <if test="query.consigneeKey != null and query.consigneeKey != '' ">
AND (nee.name like concat("%",concat(#{query.consigneeKey},"%")) or AND (nee.name like concat("%",#{query.consigneeKey},"%") or
nee.phone like concat("%",concat(#{query.consigneeKey},"%")) nee.phone like concat("%",#{query.consigneeKey},"%") or
nee.customer_number like concat("%",concat(#{query.consigneeKey},"%")) ) nee.customer_number like concat("%",#{query.consigneeKey},"%") )
</if> </if>
<!--状态--> <!--状态-->
<if test="query.status != null and query.status != '' "> <if test="query.pickStateList != null and query.pickStateList.size >0">
AND occ.status = #{query.status} and occ.status in
<foreach collection="query.pickStateList" item="status" open="(" close=")" separator=",">
#{status}
</foreach>
</if> </if>
<!--放货日期--> <!--放货日期-->
<if test="query.beginCreateTime != null"> <if test="query.beginReleaseTime != null and query.endReleaseTime != null ">
AND occ.create_time between #{query.beginCreateTime} and #{query.endCreateTime} AND occ.create_time between #{query.beginReleaseTime} and #{query.endReleaseTime}
</if> </if>
<!--发货人电话--> <!--发货人电话-->
<if test="query.consignorPhone != null and query.consignorPhone != '' "> <if test="query.consignorPhone != null and query.consignorPhone != '' ">
AND nor.phone like concat("%",concat(#{query.consignorPhone},"%")) ) AND nor.phone like concat("%",#{query.consignorPhone},"%")
</if> </if>
<!--收货人电话--> <!--收货人电话-->
<if test="query.consigneePhone != null and query.consigneePhone != '' "> <if test="query.consigneePhone != null and query.consigneePhone != '' ">
AND nee.phone like concat("%",concat(#{query.consigneePhone},"%")) ) AND nee.phone like concat("%",#{query.consigneePhone},"%")
</if> </if>
<!--复核日期--> <!--复核日期-->
<if test="query.beginCheckTime != null"> <if test="query.beginCheckTime != null and query.endCheckTime != null ">
AND occ.check_time between #{query.beginCheckTime} and #{query.endCheckTime} AND occ.check_time between #{query.beginCheckTime} and #{query.endCheckTime}
</if> </if>
<!--控货状态--> <!--控货状态-->
...@@ -163,26 +184,73 @@ ...@@ -163,26 +184,73 @@
</foreach> </foreach>
</if> </if>
<!--目的国--> <!--目的国-->
<if test="params.destCountryIds != null and params.destCountryIds.size()>0 "> <if test="query.destCountryIds != null and query.destCountryIds.size()>0 ">
and ew_dest.`guojia` in and ew_dest.`guojia` in
<foreach item='destCountry' index='index' collection='params.destCountryIds' open='(' separator=',' close=')'> <foreach item='destCountry' index='index' collection='query.destCountryIds' open='(' separator=',' close=')'>
#{destCountry} #{destCountry}
</foreach> </foreach>
</if> </if>
<!--目的地--> <!--目的地-->
<if test="params.destCityIds != null and params.destCityIds.size()>0 "> <if test="query.destCityIds != null and query.destCityIds.size()>0 ">
and ew_dest.`shi` in and ew_dest.`shi` in
<foreach item='destCity' index='index' collection='params.destCityIds' open='(' separator=',' close=')'> <foreach item='destCity' index='index' collection='query.destCityIds' open='(' separator=',' close=')'>
#{destCity} #{destCity}
</foreach> </foreach>
</if> </if>
<!--出货渠道--> <!--出货渠道-->
<if test="params.shippingChannelIdList != null and params.shippingChannelIdList.size()>0 "> <if test="query.shippingChannelIdList != null and query.shippingChannelIdList.size()>0 ">
and ec.id in and ec.channel_id in
<foreach item='id' index='index' collection='params.shippingChannelIdList' open='(' separator=',' close=')'> <foreach item='id' index='index' collection='query.shippingChannelIdList' open='(' separator=',' close=')'>
#{id} #{id}
</foreach> </foreach>
</if> </if>
<!--订单时间类型-->
<if test="query.beginCreateTime != null and query.endCreateTime != null ">
AND o.create_time between #{query.beginCreateTime} and #{query.endCreateTime}
</if>
<if test="query.beginRucangTime != null and query.endRucangTime != null ">
AND o.`rucang_time` between #{query.beginRucangTime} and #{query.endRucangTime}
</if>
<if test="query.beginRucangTime != null and query.endRucangTime != null ">
AND o.`rucang_time` between #{query.beginRucangTime} and #{query.endRucangTime}
</if>
<if test="query.beginWarehouseInTime != null and query.endWarehouseInTime != null ">
AND o.order_id in(select distinct wi.order_id from ecw_order_warehouse_in wi where wi.deleted = 0 and
wi.`update_time` between #{query.beginWarehouseInTime} and #{query.endWarehouseInTime})
</if>
<if test="query.beginPreLoadTime != null and query.endPreLoadTime != null ">
AND o.`status` > 5 AND o.`pre_load_time` between #{query.beginPreLoadTime} and #{query.endPreLoadTime}
</if>
<if test="query.beginSplitTime != null and query.endSplitTime != null ">
AND o.`split_time` between #{query.beginSplitTime} and #{query.endSplitTime}
</if>
<if test="query.beginLoadTime != null and query.endLoadTime != null ">
AND o.`status` > 5 AND o.`load_time` between #{query.beginLoadTime} and #{query.endLoadTime}
</if>
<if test="query.beginOutboundTime != null and query.endOutboundTime != null ">
AND o.`status` > 5 AND o.container_number in(select distinct b.self_no from ecw_box_air_checkout bc join ecw_box b ON bc.shipment_id = b.id
where b.deleted = 0 and bc.deleted = 0 and bc.`checkout_time` between #{query.beginOutboundTime} and #{query.endOutboundTime})
</if>
<if test="query.beginDaogangTime != null and query.endDaogangTime != null ">
AND o.`daogang_time` between #{query.beginDaogangTime} and #{query.endDaogangTime}
</if>
<if test="query.beginQingguanTime != null and query.endQingguanTime != null ">
AND o.`qingguan_time` between #{query.beginQingguanTime} and #{query.endQingguanTime}
</if>
<if test="query.beginUnloadTime != null and query.endUnloadTime != null ">
AND o.`unload_time` between #{query.beginUnloadTime} and #{query.endUnloadTime}
</if>
<if test="query.beginPickUpTime != null and query.endPickUpTime != null ">
AND o.order_no in(select distinct op.order_id from ecw_order_pickup op where op.deleted = 0 and
op.`create_time` between #{query.beginPickUpTime} and #{query.endPickUpTime})
</if>
<if test="query.beginTakeTime != null and query.endTakeTime != null ">
AND o.`take_time` between #{query.beginTakeTime} and #{query.endTakeTime}
</if>
<if test="query.beginPickTime != null and query.endPickTime != null ">
AND o.order_id in(select distinct op.order_id from ecw_order_cargo_control_pick op where op.deleted = 0 and
op.status in(1,3) and op.`create_time` between #{query.beginPickTime} and #{query.endPickTime})
</if>
AND occ.deleted = 0 AND occ.deleted = 0
AND o.is_cargo_control = 1 AND o.is_cargo_control = 1
</where> </where>
......
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderCargoControlPick/OrderCargoControlPickController.java
View file @ fc6e0344
...@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControl ...@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControl
import cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoControlPickService; import cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoControlPickService;
import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO; import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO; import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
import cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO; import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -50,12 +51,18 @@ public class OrderCargoControlPickController { ...@@ -50,12 +51,18 @@ public class OrderCargoControlPickController {
*/ */
@GetMapping("/cargo/control/orderDetail") @GetMapping("/cargo/control/orderDetail")
@ApiOperation("获得控货订单列表查询订单分页") @ApiOperation("获得控货订单列表查询订单分页")
public CommonResult<PageResult<OrderCargoControlReleaseInfoDto>> orderDetailList(OrderQueryVO query, PageVO page) { public CommonResult<PageResult<OrderCargoControlReleaseInfoDto>> orderCargoControlDetailList(OrderQueryVO query, PageVO page) {
PageResult<OrderCargoControlReleaseInfoDto> pageResult = PageResult<OrderCargoControlReleaseInfoDto> pageResult =
orderCargoControlPickService.orderDetailList(query, page); orderCargoControlPickService.orderCargoControlDetailList(query, page);
return success(pageResult); return success(pageResult);
} }
@GetMapping("/cargo/control/statistics")
@ApiOperation("查询控货订单列表统计")
public CommonResult<StatisticsOrderVO> statisticsOrderControl(OrderQueryVO query) {
return success(orderCargoControlPickService.statisticsOrderControl(query));
}
@PostMapping("/create") @PostMapping("/create")
@ApiOperation("创建订单控货人放货记录") @ApiOperation("创建订单控货人放货记录")
@Idempotent(timeout = 5) @Idempotent(timeout = 5)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment