136

后台-集运-包裹列表-操作-撤出包裹

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/WorkFlowEmus.java

@@ -98,6 +98,8 @@ public enum WorkFlowEmus {
     ORDER_WAREHOUSING("order_warehousing", "订单审批-入仓申请"),
     ECW_CONS_FEE_APPLY("ecw_cons_fee_apply","集运包裹-批量费用申请"),
     ECW_CONS_RETIRED_WAREHOUSE("ecw_cons_retired_warehouse", "集运包裹-退仓审核"),
+    ECW_CONS_EXIT_WAREHOUSE("ecw_cons_exit_warehouse", "集运包裹-包裹撤出订单审核"),
+    ECW_CONS_ADD_WAREHOUSE("ecw_cons_add_warehouse", "集运包裹-包裹追加订单审核"),
     ;
     private String key;
     private String value;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsBackVO.java

@@ -58,7 +58,7 @@ public class ConsBackVO {
 
     @ExcelProperty("订单状态")
     @ApiModelProperty(value = "订单状态")
-    private Long orderStatus;
+    private Integer orderStatus;
 
     @ExcelProperty("平台ID，关联平台表数据，为后面系统对接预留字段")
     @ApiModelProperty(value = "平台ID，关联平台表数据，为后面系统对接预留字段")

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/cons/ConsController.java

@@ -18,11 +18,13 @@ import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
 import cn.iocoder.yudao.module.order.convert.cons.ConsConvert;
 import cn.iocoder.yudao.module.order.dal.dataobject.cons.ConsDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consMedia.ConsMediaDO;
+import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.service.cons.ConsService;
 import cn.iocoder.yudao.module.order.service.consItem.ConsItemService;
 import cn.iocoder.yudao.module.order.service.consLocation.ConsLocationService;
 import cn.iocoder.yudao.module.order.service.consMedia.ConsMediaService;
 import cn.iocoder.yudao.module.order.service.consTrackingRecord.ConsTrackingRecordService;
+import cn.iocoder.yudao.module.order.service.order.OrderService;
 import cn.iocoder.yudao.module.order.vo.cons.*;
 import cn.iocoder.yudao.module.order.vo.consApproval.ConsApprovalQueryVO;
 import cn.iocoder.yudao.module.order.vo.consApproval.ConsRetiredWarehouseCreateReqVO;
@@ -81,6 +83,9 @@ public class ConsController {
     @Resource
     private ConsItemService consItemService;
 
+    @Resource
+    private OrderService orderService;
+
     @Resource
     private ConsLocationService consLocationService;
 
@@ -138,6 +143,11 @@ public class ConsController {
         consBackVO.setAreaCode(customerContacts.getAreaCode());
         consBackVO.setPhoneNew(customerContacts.getPhoneNew());
         consBackVO.setCustomerName(customer.getName());
+        if (consBackVO.getOrderId()!=null){
+            OrderDO orderDO = orderService.getById(consBackVO.getOrderId());
+            consBackVO.setOrderNo(orderDO.getOrderNo());
+            consBackVO.setOrderStatus(orderDO.getStatus());
+        }
         //获取签收图片
         if (cons.getSigned()) {
             ConsMediaDO consMedia = consentMediaService.getOne(new LambdaQueryWrapperX<ConsMediaDO>().eq(ConsMediaDO::getConsId, cons.getId())