Merge remote-tracking branch 'origin/release' into release

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxApprovalMapper.java

@@ -57,6 +57,7 @@ public interface BoxApprovalMapper extends AbstractMapper<BoxApprovalDO> {
             "from ecw_box_approval a",
             "where ",
             "a.shipment_id = #{shipmentId}",
+            "a.status = 0",
             "and (a.order_id is null or (a.order_id is not null and a.order_id = #{orderId}) )",
             "order by a.id desc",
             "</script>"

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/BoxCheckOrderApprovalListener.java

@@ -56,72 +56,72 @@ public class BoxCheckOrderApprovalListener {
             switch (typeEnum) {
                 case PRELOAD:
                     //预装
-                    event.setAuditType(pre_install_processing.getResult());
+                    event.setAuditType(pre_install_processing.getType());
                     event.setAuditResult(pre_install_processing.getDesc());
                     return;
                 case SEALING_CABINET:
                     //装柜
-                    event.setAuditType(closure_processing.getResult());
+                    event.setAuditType(closure_processing.getType());
                     event.setAuditResult(closure_processing.getDesc());
                     return;
                 case UNLOAD_CABINET:
                     // 卸柜
-                    event.setAuditType(unloading_cabinet_processing.getResult());
+                    event.setAuditType(unloading_cabinet_processing.getType());
                     event.setAuditResult(unloading_cabinet_processing.getDesc());
                     return;
                 case PRELOAD_UMPIRE:
                     //预装反审
-                    event.setAuditType(pre_install_back_processing.getResult());
+                    event.setAuditType(pre_install_back_processing.getType());
                     event.setAuditResult(pre_install_back_processing.getDesc());
                     return;
                 case CUSTOMS_FULL_REFUND:
                     //报关全退
-                    event.setAuditType(customs_exit_processing.getResult());
+                    event.setAuditType(customs_exit_processing.getType());
                     event.setAuditResult(customs_exit_processing.getDesc());
                     return;
                 case UNLOAD_UMPIRE:
                     //卸柜反审
-                    event.setAuditType(unloading_cabinet_back_processing.getResult());
+                    event.setAuditType(unloading_cabinet_back_processing.getType());
                     event.setAuditResult(unloading_cabinet_back_processing.getDesc());
                     return;
                 case SEALING_CABINET_UMPIRE:
                     //封柜反审
-                    event.setAuditType(closure_back_processing.getResult());
+                    event.setAuditType(closure_back_processing.getType());
                     event.setAuditResult(closure_back_processing.getDesc());
                     return;
                 case AIR_SORTING:
                     // 排单分拣
-                    event.setAuditType(sorting_processing.getResult());
+                    event.setAuditType(sorting_processing.getType());
                     event.setAuditResult(sorting_processing.getDesc());
                     return;
                 case AIR_SORTING_BACK:
                     // 排单分拣反审
-                    event.setAuditType(sorting_back_processing.getResult());
+                    event.setAuditType(sorting_back_processing.getType());
                     event.setAuditResult(sorting_back_processing.getDesc());
                     return;
                 case AIR_TO_WAREHOUSE:
                     // 到仓
-                    event.setAuditType(warehoused_processing.getResult());
+                    event.setAuditType(warehoused_processing.getType());
                     event.setAuditResult(warehoused_processing.getDesc());
                     return;
                 case AIR_TO_WAREHOUSE_BACK:
                     // 到仓反审
-                    event.setAuditType(warehoused_back_processing.getResult());
+                    event.setAuditType(warehoused_back_processing.getType());
                     event.setAuditResult(warehoused_back_processing.getDesc());
                     return;
                 case AIR_SHIPMENT:
                     // 出货
-                    event.setAuditType(shipment_processing.getResult());
+                    event.setAuditType(shipment_processing.getType());
                     event.setAuditResult(shipment_processing.getDesc());
                     return;
                 case AIR_SHIPMENT_BACK:
                     // 出货反审
-                    event.setAuditType(shipment_back_processing.getResult());
+                    event.setAuditType(shipment_back_processing.getType());
                     event.setAuditResult(shipment_back_processing.getDesc());
                     return;
                 case CLEARANCE_BACK:
                     // 撤销清关
-                    event.setAuditType(clearance_back_processing.getResult());
+                    event.setAuditType(clearance_back_processing.getType());
                     event.setAuditResult(clearance_back_processing.getDesc());
                     return;
                 default: