Merge branch 'dev' into dev_sfjk_0827

一、行为变更（ReservationStockInOrderImpl）
- 出库导入(parseExcelFile)/入库导入(parseStockInExcel)：不再固定读单一页签，枚举Excel全部工作表，每个页签独立解析为一张单据（5个页签=5张单5个单号）
- 全部回滚策略：任一页签校验失败整体不落库，报错按页签聚合列出（页签[x]：原因；页签[y]：原因）
- 空页签（无货品/客户明细）自动跳过；单页签文件行为与原先完全一致
- 出库单号改到落库阶段逐张生成：多页签下校验阶段统一生成会因全部未入库而取到相同单号
- 入库模板OrderNO增加本文件内跨页签查重：各页签都未入库时库查重互相不可见，防两页签同OrderNO重复落库
- 页签解析异常message为空时兜底用异常类名，避免报错显示null
- 方法级@Transactional(rollbackFor=Exception.class)：顺带修复旧入库导入因this自调用导致事务代理失效的问题

二、接口与返回结构（IReservationStockInOrderService / ReservationStockInOrderApi）
- 两个导入方法返回类型改为List<SheetImportResultDTO>（每页签一条：页签名/单号/物料行数/数量合计/解析数据）
- /parseExcel与/parse-excel返回：result=第一个页签解析数据（兼容老前端）、results=全部页签结果、msg=成功导入N张单：单号1、单号2…
- 入库接口不传sheetName为多页签模式，显式传页签名保持单页签老行为

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java

@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  * bms财务结算系统feign调用接口
  */
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8012",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface BmsServiceFeign {
 
 

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017",fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface OmsServiceFeign {
 
 
@@ -66,4 +66,8 @@ public interface OmsServiceFeign {
     @ApiOperation("批量推送")
     @PostMapping("/reservationStockOutOrderApi/batchPushByNumber")
     public AjaxResult batchPushByNumber(@RequestBody List<String> numberList);
+
+    @ApiOperation("保存电子签名记录")
+    @PostMapping("/electronicSignatureApi/saveSignature")
+    public AjaxResult saveSignature(@RequestBody ElectronicSignatureSyncDTO saveDTO);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java

@@ -237,6 +237,12 @@ public interface SystemServiceFeign {
     @GetMapping("/warehouseApi/getInfo/{warehouseId}")
     public AjaxResult getWarehouseInfoByWarehouseId(@PathVariable("warehouseId") Long warehouseId);
 
+    /**
+     * 根据warehouseId获取仓库及下库区及库位树（与前端 warehouseApi/getWarehouseChildren 一致，用于PC上架页默认库位回显）
+     */
+    @GetMapping("/warehouseApi/getWarehouseChildren")
+    public AjaxResult getWarehouseChildren(@RequestParam("warehouseId") Long warehouseId);
+
     /**
      * 根据storageSectionId获取对应库区信息
      */
@@ -357,6 +363,10 @@ public interface SystemServiceFeign {
     @GetMapping("/contractManageApi/getInfoByCustomer")
     public AjaxResult getInfoByCustomer(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType);
 
+    @ApiOperation("根据结算主体和费用科目获取合同信息")
+    @GetMapping(value = "/contractManageApi/getInfoByCustomerAndSecondSubjectCode")
+    public AjaxResult getInfoByCustomerAndSecondSubjectCode(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType,@RequestParam("firstSubjectCode") String firstSubjectCode,@RequestParam("topOrganizationId") Long topOrganizationId,@RequestParam("organizationId") Long organizationId);
+
     /**
      * 根据结算主体获取合同信息
      */

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java

@@ -165,6 +165,10 @@ public interface UserServiceFeign {
     @GetMapping("/userShipperApi/userShipperListAll")
     public AjaxResult<?> userShipperListAll();
 
+    @ApiOperation("查询租户下全部托运人")
+    @GetMapping("/userShipperApi/userShipperListAllByOrg")
+    public AjaxResult<?> userShipperListAllByOrg(@RequestParam("orgCode") Long orgCode);
+
     @ApiOperation("查询租户下全部承运人")
     @GetMapping("/userDriverApi/userDriverListAll")
     public AjaxResult<?> userDriverListAll();
@@ -223,4 +227,7 @@ public interface UserServiceFeign {
     @ApiOperation("查询赊销额度")
     @PostMapping("/userShipperApi/querySaleCreditLimitFeign")
     public AjaxResult querySaleCreditLimitFeign(@RequestBody UserShipperFeignDTO userShipperDTO);
+
+    @GetMapping("/userApi/getUserByUserAccount")
+    R<LoginUser> getUserByUserAccount(@RequestParam("userAccount") String account);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java

@@ -1,5 +1,6 @@
 package com.mhd.system.api;
 
+import cn.hutool.json.JSONUtil;
 import com.mhd.common.core.constant.ServiceNameConstants;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
@@ -20,7 +21,7 @@ import java.util.Map;
  * @description: TODO
  * @date 2024/5/10 8:58
  **/
-@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016",fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface WmsServiceFeign {
 
     /**
@@ -97,6 +98,18 @@ public interface WmsServiceFeign {
     @PostMapping(value = "/stockInOrderApi/omsInOrderAdd")
     public void omsInOrderAdd(@RequestBody StockInOrder stockInOrder);
 
+    @ApiOperation("oms取消下发单保存")
+    @PostMapping(value = "/stockOutOrderApi/cancelExecutionOrder")
+    public void omsCancelExecutionOrder(@RequestBody StockOutOrder stockOutOrder);
+
+    @ApiOperation("oms取消下发单自动分配")
+    @PostMapping(value = "/stockOutOrderApi/omsAutoAssign")
+    public void omsAutoAssign(@RequestBody StockOutOrderDTO stockOutOrderDTO);
+
+    @ApiOperation("oms出库执行")
+    @PostMapping(value = "/stockOutOrderApi/execution")
+    public AjaxResult execution(@RequestBody com.mhd.system.api.domain.StockOutOrderDTO stockOutOrderDTO);
+
     /**
      * oms下发单明细保存
      */
@@ -121,4 +134,29 @@ public interface WmsServiceFeign {
      */
     @GetMapping("/materialBaseInfoApi/getBatchByIds")
     public TableDataInfo getBatchByIds(@RequestParam("materialBaseInfoIds") List<Long> materialBaseInfoIds);
+
+    /**
+     * 生成拣货单
+     */
+    @ApiOperation("生成拣货单")
+    @PostMapping("/stockOutOrderApi/genPickingOrderByOms")
+    public AjaxResult genPickingOrderByOms(@RequestBody com.mhd.system.api.domain.StockOutOrderDTO stockOutOrderDTO);
+
+    /**
+     * OMS批量签名：更新WMS入/出库单签名字段
+     *
+     * <p>OMS端勾选记录批量签名后，通过此Feign调用WMS的 /stockSignatureApi/batchSign 接口，
+     * 同步更新WMS stock_in_order / stock_out_order 表的签名状态、签名时间、签名图片、签名备注。</p>
+     */
+    @ApiOperation("OMS批量签名-同步WMS入/出库单签名字段")
+    @PostMapping("/stockSignatureApi/batchSign")
+    public AjaxResult batchSignWms(@RequestBody SignatureBatchFeignDTO dto);
+
+    /**
+     * OMS查询WMS线路管理列表(按线路编码模糊查,OMS侧自行精确匹配),
+     * 出库导入时校验送貨線號/車次并回填线路名称
+     */
+    @ApiOperation("OMS查询WMS线路管理列表")
+    @GetMapping("/lineManagementApi/listByApp")
+    public AjaxResult listLineManagement(@RequestParam("routeCode") String routeCode);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/XxlJobServiceFeign.java

@@ -0,0 +1,23 @@
+package com.mhd.system.api;
+
+
+import com.mhd.common.core.constant.ServiceNameConstants;
+import com.mhd.common.core.domain.entity.R;
+import com.mhd.common.core.domain.dto.YmsSysUserDTO;
+import com.mhd.system.api.domain.YmsLoginUser;
+import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory;
+import com.mhd.system.api.factory.RemoteXxlJobFeignFallbackFactory;
+import com.mhd.system.api.feign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@FeignClient(contextId = "XxlJobService", value = ServiceNameConstants.XXL_JOB_SERVICE,url = "http://127.0.0.1:8020",fallbackFactory = RemoteXxlJobFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+public interface XxlJobServiceFeign {
+
+
+    @GetMapping("/user/openFeignTest")
+    public R<Map<String, Object>> openFeignTest(@RequestParam("param") String string);
+
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java

@@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,url = "http://10.102.192.4:8018",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface YmsServiceFeign {
 
     /**

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ElectronicSignatureSyncDTO.java

@@ -0,0 +1,108 @@
+package com.mhd.system.api.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 电子签名同步DTO（WMS端通过Feign调用OMS）
+ */
+@Data
+public class ElectronicSignatureSyncDTO {
+
+    @ApiModelProperty("订单ID")
+    private Long orderId;
+
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+
+    @ApiModelProperty("订单类型：IN-入库 OUT-出库")
+    private String orderType;
+
+    @ApiModelProperty("组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("仓库ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("创建人")
+    private Long createBy;
+
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
+
+    @ApiModelProperty("物料明细列表")
+    private List<MaterialDetailItem> materialDetailList;
+
+    @Data
+    public static class MaterialDetailItem {
+
+        @ApiModelProperty("物料基础信息ID")
+        private Long materialBaseInfoId;
+
+        @ApiModelProperty("物料编码")
+        private String materialCode;
+
+        @ApiModelProperty("物料名称")
+        private String materialName;
+
+        @ApiModelProperty("数量")
+        private BigDecimal quantity;
+
+        @ApiModelProperty("单位代码")
+        private String unitCode;
+
+        @ApiModelProperty("单位名称")
+        private String unitName;
+
+        @ApiModelProperty("批次号")
+        private String batchNumber;
+
+        @ApiModelProperty("LOT编号")
+        private String lotNumber;
+
+        @ApiModelProperty("仓库ID")
+        private Long warehouseId;
+
+        @ApiModelProperty("仓库编码")
+        private String warehouseCode;
+
+        @ApiModelProperty("仓库名称")
+        private String warehouseName;
+
+        @ApiModelProperty("库区ID")
+        private Long storageSectionId;
+
+        @ApiModelProperty("库区编码")
+        private String storageSectionCode;
+
+        @ApiModelProperty("库区名称")
+        private String storageSectionName;
+
+        @ApiModelProperty("库位ID")
+        private Long storageLocationId;
+
+        @ApiModelProperty("库位编码")
+        private String storageLocationCode;
+
+        @ApiModelProperty("库位名称")
+        private String storageLocationName;
+
+        @ApiModelProperty("业务唯一ID")
+        private Long uniqueId;
+    }
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java

@@ -240,9 +240,7 @@ public class InMaterialDetail extends BaseVOEntity {
     @ApiModelProperty("父级唯一Id")
     private Long parentUniqueId;
 
-    @ApiModelProperty("备注")
-    @Excel(name = "备注")
-    private String remark;
+
 
     @ApiModelProperty("越库单id")
     private Long overStockId;
@@ -376,4 +374,29 @@ public class InMaterialDetail extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
+
+    @ApiModelProperty("过期日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date expiryDate;
+
+    @ApiModelProperty("来货验收是否合格；1 合格，0 不合格")
+    @Excel(name = "来货验收是否合格；1 合格，0 不合格")
+    private String arrivalAcceptQualified;
+
+    @ApiModelProperty("包装是否破损；1 破损，0 完好")
+    @Excel(name = "包装是否破损；1 破损，0 完好")
+    private String packageDamaged;
+
+    @ApiModelProperty("是否解冻 / 水渍；1 是，0 否")
+    @Excel(name = "是否解冻 / 水渍；1 是，0 否")
+    private String isThawWaterstain;
+
+    @ApiModelProperty("问题货是否已通知客户；1 已通知，0 未通知")
+    @Excel(name = "问题货是否已通知客户；1 已通知，0 未通知")
+    private String notifyCustomerAbnormal;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java

@@ -244,4 +244,10 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
 
     @ApiModelProperty(name = "单位")
     private String unit;
+
+    @ApiModelProperty(name = "组织(多个用,分开)")
+    private String orgId;
+
+    @ApiModelProperty(name = "是否正常物料: 0-是 1-否")
+    private Integer isNormalMaterial;
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInventoryOmsParamDO.java

@@ -83,5 +83,9 @@ public class MaterialInventoryOmsParamDO extends BaseVOEntity {
     private Date productionDate;
     //过期日期
     private Date expiryDate;
+    //进货日期
+    private Date purchaseDate;
+
+    private String executioOrderNumber;
 
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/SignatureBatchFeignDTO.java

@@ -0,0 +1,42 @@
+package com.mhd.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * OMS→WMS 批量签名 Feign DTO
+ * 
+ * <p>OMS端批量签名时，通过此DTO调用WMS的批量签名接口，
+ * 更新WMS stock_in_order / stock_out_order 表的签名字段。</p>
+ */
+@Data
+public class SignatureBatchFeignDTO {
+
+    @ApiModelProperty("入库单ID列表")
+    private List<Long> inOrderIds;
+
+    @ApiModelProperty("出库单ID列表")
+    private List<Long> outOrderIds;
+
+    @ApiModelProperty("签名状态：2-已签名")
+    private Integer signatureStatus;
+
+    @ApiModelProperty("签名时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date signatureTime;
+
+    @ApiModelProperty("手写签名图片（base64或URL，单张）")
+    private String signaturePic;
+
+    @ApiModelProperty("拍照取证图片（逗号分隔多张URL）")
+    private String evidencePics;
+
+    @ApiModelProperty("签名备注")
+    private String signatureRemark;
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java

@@ -50,8 +50,8 @@ public class StockOutOrder extends BaseVOEntity {
     @Excel(name = "出库单号")
     private String outOrderNumber;
 
-    @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
-    @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
+    @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接")
+    @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接")
     private Integer status;
 
     @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
@@ -405,4 +405,13 @@ public class StockOutOrder extends BaseVOEntity {
     @Excel(name = "车次")
     private Integer trainNo;
 
+    @ApiModelProperty("线路编码(取自WMS线路管理)")
+    private String lineCode;
+
+    @ApiModelProperty("线路名称(冗余存储)")
+    private String lineName;
+
+    @ApiModelProperty("车次序号(显示: 线路编码-车次, 如31-4)")
+    private String shuttleNo;
+
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderDTO.java

@@ -0,0 +1,486 @@
+package com.mhd.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 出库单对象 stock_out_order
+ *
+ * @author gen
+ * @date 2024-05-28
+ */
+
+@Data
+public class StockOutOrderDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("出库单id")
+    private Long outOrderId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("通知单号")
+    @Excel(name = "通知单号")
+    private String noticeNumber;
+
+    @ApiModelProperty("出库单号")
+    @Excel(name = "出库单号")
+    private String outOrderNumber;
+
+    @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
+    @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
+    private Integer status;
+
+    @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    @Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    private Integer auditStatus;
+
+    @ApiModelProperty("出库单审核备注")
+    @Excel(name = "出库单审核备注")
+    private String auditRemark;
+
+    @ApiModelProperty("出库单审核人")
+    @Excel(name = "出库单审核人")
+    private Long auditBy;
+
+    @ApiModelProperty("出库单审核人姓名")
+    @Excel(name = "出库单审核人姓名")
+    private String auditByName;
+
+    @ApiModelProperty("出库单审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date auditTime;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    @Excel(name = "货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
+    private String shipperCode;
+    
+    @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("出库单类型编码")
+    @Excel(name = "出库单类型编码")
+    private String orderTypeCode;
+
+    @ApiModelProperty("出库单类型名称")
+    @Excel(name = "出库单类型名称")
+    private String orderTypeName;
+
+    @ApiModelProperty("客户id")
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty("预计出货时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "预计出货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date expectTime;
+
+    @ApiModelProperty("供应链订单号")
+    @Excel(name = "供应链订单号")
+    private String supplyChainNumber;
+
+    @ApiModelProperty("优先级别编码")
+    @Excel(name = "优先级别编码")
+    private String priorityLevelCode;
+
+    @ApiModelProperty("优先级别名称")
+    @Excel(name = "优先级别名称")
+    private String priorityLevelName;
+
+    @ApiModelProperty("是否直接出库: 1-是 2-否")
+    @Excel(name = "是否直接出库: 1-是 2-否")
+    private Integer directWarehouse;
+
+    @ApiModelProperty("是否复核: 1-是 2-否")
+    @Excel(name = "是否复核: 1-是 2-否")
+    private Integer review;
+
+    @ApiModelProperty("附件url")
+    @Excel(name = "附件url")
+    private String annexUrl;
+
+    @ApiModelProperty("物料种数")
+    @Excel(name = "物料种数")
+    private Integer materialQuantity;
+    
+    @ApiModelProperty("计划数量")
+    @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty("净重 单位：千克")
+    @Excel(name = "净重 单位：千克")
+    private BigDecimal weightLimit;
+
+    @ApiModelProperty("体积 单位：立方米")
+    @Excel(name = "体积 单位：立方米")
+    private BigDecimal volumeLimit;
+
+    @ApiModelProperty("分配数量")
+    @Excel(name = "分配数量")
+    private BigDecimal allocationQuantity;
+
+
+    @ApiModelProperty("已生成拣货单数量")
+    @Excel(name = "已生成拣货单分配数量")
+    private BigDecimal alreadyAllocationQuantity;
+
+    @ApiModelProperty("拣货数量")
+    @Excel(name = "拣货数量")
+    private BigDecimal pickingQuantity;
+
+    @ApiModelProperty("复核数量")
+    @Excel(name = "复核数量")
+    private BigDecimal checkQuantity;
+
+    @ApiModelProperty("是否取消订单: 1-是 2-否")
+    @Excel(name = "是否取消订单: 1-是 2-否")
+    private Integer cancelOrder;
+
+    @ApiModelProperty("取消订单备注")
+    @Excel(name = "取消订单备注")
+    private String cancelRemark;
+
+    @ApiModelProperty("取消订单人")
+    @Excel(name = "取消订单人")
+    private Long cancelBy;
+
+    @ApiModelProperty("取消订单人姓名")
+    @Excel(name = "取消订单人姓名")
+    private String cancelByName;
+
+    @ApiModelProperty("取消订单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date cancelTime;
+
+    @ApiModelProperty("是否关闭订单: 1-是 2-否")
+    @Excel(name = "是否关闭订单: 1-是 2-否")
+    private Integer closeOrder;
+
+    @ApiModelProperty("关闭订单备注")
+    @Excel(name = "关闭订单备注")
+    private String closeRemark;
+
+    @ApiModelProperty("关闭订单人")
+    @Excel(name = "关闭订单人")
+    private Long closeBy;
+
+    @ApiModelProperty("关闭订单人姓名")
+    @Excel(name = "关闭订单人姓名")
+    private String closeByName;
+
+    @ApiModelProperty("关闭订单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date closeTime;
+
+    @ApiModelProperty("复核状态: 1-未复核 2-复核中 3-已复核")
+    @Excel(name = "复核状态: 1-未复核 2-复核中 3-已复核")
+    private Integer checkStatus;
+
+    @ApiModelProperty("复核任务是否下发: 1-是 2-否")
+    @Excel(name = "复核任务是否下发: 1-是 2-否")
+    private Integer checkTaskDistribution;
+
+    @ApiModelProperty("复核任务下发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "复核任务下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date checkTaskDistributionTime;
+
+    @ApiModelProperty("复核作业人用户ID")
+    @Excel(name = "复核作业人用户ID")
+    @JsonAlias({"checkOperatorId", "operatorId"})
+    private Long checkOperatorsBy;
+
+    @ApiModelProperty("复核作业人姓名")
+    @Excel(name = "复核作业人姓名")
+    private String checkOperatorsName;
+
+    @ApiModelProperty("调度单号")
+    @Excel(name = "调度单号")
+    private String mobilizeCode;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("出库单id集合")
+    private List<Long> outOrderIds;
+
+//    @ApiModelProperty("物料明细")
+//    private List<OutMaterialDetailDTO> materialDetailList;
+
+    @ApiModelProperty("物料条形码")
+    @Excel(name = "物料条形码")
+    private String barCode;
+
+    @ApiModelProperty("物料审核数量")
+    @Excel(name = "物料审核数量")
+    private BigDecimal actualQuantity;
+
+    @ApiModelProperty("波次类型编码")
+    private String waveOrderTypeCode;
+
+    @ApiModelProperty("大于复核状态: 1-未复核 2-复核中 3-已复核")
+    private Integer gtCheckStatus;
+
+    @ApiModelProperty("小于复核状态: 1-未复核 2-复核中 3-已复核")
+    private Integer ltCheckStatus;
+
+    @ApiModelProperty("PDA复核查询tab: 1-列表(待复核) 2-历史记录(已复核)")
+    private Integer tabType;
+
+    @ApiModelProperty("to")
+    @Excel(name = "to")
+    private String to;
+
+    @ApiModelProperty("联系人")
+    @Excel(name = "联系人")
+    private String contactPerson;
+
+    @ApiModelProperty("车型及车牌")
+    @Excel(name = "车型及车牌")
+    private String vehicleModelPlate;
+
+    @ApiModelProperty("委托编号")
+    @Excel(name = "委托编号")
+    private String entrustNo;
+
+    @ApiModelProperty("Tel")
+    @Excel(name = "Tel")
+    private String tel;
+
+    @ApiModelProperty("司机签名")
+    @Excel(name = "司机签名")
+    private String driverSign;
+
+    @ApiModelProperty("Fax")
+    @Excel(name = "Fax")
+    private String fax;
+
+    @ApiModelProperty("申报地关区")
+    @Excel(name = "申报地关区")
+    private String declareCustoms;
+
+    @ApiModelProperty("生产商")
+    @Excel(name = "生产商")
+    private String manufacturer;
+
+    @ApiModelProperty("报关员姓名及联系方式")
+    @Excel(name = "报关员姓名及联系方式")
+    private String customsDeclarerInfo;
+
+    @ApiModelProperty("送货地址")
+    @Excel(name = "送货地址")
+    private String deliveryAddr;
+
+    @ApiModelProperty("进出境关别")
+    @Excel(name = "进出境关别")
+    private String entryExitCustoms;
+
+    @ApiModelProperty("起运/运抵国(地区）")
+    @Excel(name = "起运/运抵国(地区）")
+    private String departureArrivalCountry;
+
+    @ApiModelProperty("承运商")
+    @Excel(name = "承运商")
+    private String carrier;
+
+    @ApiModelProperty("柜号")
+    @Excel(name = "柜号")
+    private String containerNo;
+
+    @ApiModelProperty("柜")
+    @Excel(name = "柜")
+    private String containerNoName;
+
+    @ApiModelProperty("出仓日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outboundDate;
+    @ApiModelProperty("完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date completeTime;
+    @ApiModelProperty("orderDate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "orderDate", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date orderDate;
+
+    @ApiModelProperty("运输方式")
+    @Excel(name = "运输方式")
+    private String transportModeCode;
+    @ApiModelProperty("运输方式")
+    @Excel(name = "运输方式")
+    private String transportModeName;
+    @ApiModelProperty("监管方式")
+    @Excel(name = "监管方式")
+    private String supervisionModeCode;
+    @ApiModelProperty("监管方式")
+    @Excel(name = "监管方式")
+    private String supervisionModeName;
+    @ApiModelProperty("海关是否查验货物")
+    @Excel(name = "海关是否查验货物")
+    private String customsInspectionFlag;
+    @ApiModelProperty("是否需要报关")
+    @Excel(name = "是否需要报关")
+    private String needDeclareFlag;
+    @ApiModelProperty("是否需要运输")
+    @Excel(name = "是否需要运输")
+    private String needTransportFlag;
+
+    @ApiModelProperty(name = "创建时间查询条件开始日期")
+    private String createTimeStart;
+
+    @ApiModelProperty(name = "创建时间查询条件结束日期")
+    private String createTimeEnd;
+
+    @ApiModelProperty(name = "审核时间查询条件开始日期")
+    private String auditTimeStart;
+
+    @ApiModelProperty(name = "审核时间查询条件结束日期")
+    private String auditTimeEnd;
+
+    @ApiModelProperty("出库明细-物料名称（商品名称），模糊匹配，与前端参数 materialName 一致")
+    private String materialName;
+
+    @ApiModelProperty("出库明细-物料编码，模糊匹配，与前端参数 materialCode 一致")
+    private String materialCode;
+
+    @ApiModelProperty("出库交接图片，PDA出库交接时上传的照片，多张图片以逗号隔开")
+    private String pictureApp;
+
+    @ApiModelProperty("业务单号")
+    @Excel(name = "业务单号")
+    private String businessOrderNo;
+
+    @ApiModelProperty("业务类型")
+    @Excel(name = "业务类型")
+    private String businessType;
+
+    @ApiModelProperty("制单人")
+    @Excel(name = "制单人")
+    private String documentCreator;
+
+    @ApiModelProperty("制单人名称")
+    @Excel(name = "制单人名称")
+    private String documentCreatorName;
+
+    @ApiModelProperty("制单日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date documentDate;
+    @ApiModelProperty("承运商名称")
+    @Excel(name = "承运商名称")
+    private String carrierName;
+    @ApiModelProperty("计费信息")
+    private String billingJson;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
+//    @ApiModelProperty("费用")
+//    List<ReceiptOrderAccount> receiptOrderAccountList;
+    @ApiModelProperty("退货数量")
+    @Excel(name = "退货数量")
+    private BigDecimal returnQuantity;
+    /**
+     * 提货单打印所选模版（与图5单选项文案一致即可）。可传副标题如「谷丰--营销部」，或整段「提货单--谷丰--营销部」；不传则标题为「提货单」
+     */
+    @ApiModelProperty("提货单打印模版名/弹窗选项全文；后端生成 printTitle（-- 会规范为 ——）")
+    private String noticePrintTemplateName;
+    @ApiModelProperty("车次")
+    @Excel(name = "车次")
+    private Integer trainNo;
+    @ApiModelProperty("推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
+    private Integer pushStatus;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("推送时间")
+    private Date pushTime;
+
+    @ApiModelProperty("推送人")
+    private Long pushBy;
+
+    @ApiModelProperty("推送人姓名")
+    private String pushByName;
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeFrom;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeTo;
+
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeFrom;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeTo;
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderAddDTO.java

@@ -46,8 +46,8 @@ TmsOrderAddDTO implements Serializable {
     @ApiModelProperty(value = "装货电话")
     private String loadingPhone="";
     @ApiModelProperty(value = "装货时间日期（年月日）",required = true)
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private java.util.Date loadingDate;
 //    @ApiModelProperty(value = "装货时间（上午、下午、24小时）")
 //    private String loadingTime="";

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseFeignPO.java

@@ -116,6 +116,28 @@ public class WarehouseFeignPO extends BaseVOEntity{
     @Excel(name = "是否作废: 1-否 2-是")
     private Integer nullify;
 
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
 
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
+
+    @ApiModelProperty("订单号生成规则(0-日期累加 1-历史累加)")
+    @Excel(name = "单号生成规则")
+    private String orderNoGenerateRule;
+
+    @ApiModelProperty("入库单号首字母前缀")
+    @Excel(name = "入库单号首字母前缀")
+    private String inOrderNoPrefix;
+
+    @ApiModelProperty("出库单号首字母前缀")
+    @Excel(name = "出库单号首字母前缀")
+    private String outOrderNoPrefix;
+
+    @ApiModelProperty("样品出库单号首字母前缀")
+    @Excel(name = "样品出库单号首字母前缀")
+    private String sampleOutOrderNoPrefix;
 
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseLinkageFeignPO.java

@@ -0,0 +1,30 @@
+package com.mhd.system.api.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 仓库联动树节点（Feign侧）
+ * 镜像system端WarehouseLinkagePO/StorageSectionLinkagePO/StorageLocationLinkagePO三级结构：仓库→库区→库位
+ *
+ * @author rcx
+ * @date 2026-08-22
+ */
+@Data
+public class WarehouseLinkageFeignPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 仓库id / 库区id(storageSectionId) / 库位id(storageLocationId) */
+    private Long id;
+
+    /** warehouseCode / storageCode / storageLocationCode */
+    private String code;
+
+    /** warehouseName / storageName / storageLocationName */
+    private String name;
+
+    /** 下级节点：仓库下为库区列表，库区下为库位列表，库位无children */
+    private List<WarehouseLinkageFeignPO> children;
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java

@@ -90,6 +90,11 @@ public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsService
             public AjaxResult batchPushByNumber(List<String> numberList) {
                 return null;
             }
+
+            @Override
+            public AjaxResult saveSignature(ElectronicSignatureSyncDTO saveDTO) {
+                return null;
+            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java

@@ -20,6 +20,7 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -184,6 +185,11 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
                 return AjaxResult.error("根据仓库ID获取仓库信息失败");
             }
 
+            @Override
+            public AjaxResult getWarehouseChildren(@RequestParam("warehouseId") Long warehouseId) {
+                return AjaxResult.error("根据仓库ID获取仓库及下库区及库位树失败");
+            }
+
             @Override
             public AjaxResult getStorageSectionInfoByStorageSectionId(@PathVariable("storageSectionId") Long storageSectionId) {
                 return AjaxResult.error("根据库区ID获取库区信息失败");
@@ -284,6 +290,10 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
                 return AjaxResult.error("查询失败");
             }
 
+            @Override
+            public AjaxResult getInfoByCustomerAndSecondSubjectCode(String settlementCustomersCode, Integer contractType, String firstSubjectCode, Long topOrganizationId, Long organizationId) {
+                return null;
+            }
             @Override
             public AjaxResult getInfoByCustomer2(String settlementCustomersCode, Integer contractType, Long topOrganizationId) {
                 return AjaxResult.error("查询失败");

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java

@@ -140,6 +140,11 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
                 return AjaxResult.error("获取租户托运人失败");
             }
 
+            @Override
+            public AjaxResult<?> userShipperListAllByOrg(Long orgCode) {
+                return null;
+            }
+
             @Override
             public AjaxResult<?> userDriverListAll() {
                 return AjaxResult.error("获取租户承运人失败");
@@ -170,6 +175,11 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
                 return R.fail("获取组织用户失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<LoginUser> getUserByUserAccount(String userAccount) {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
             @Override
             public R<LoginUser> getUserByTopOrganizationUserPhone(@RequestBody UserDTO userDTO, String source) {
                 return R.fail("获取组织用户失败:" + throwable.getMessage());

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java

@@ -73,6 +73,21 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             public void omsInOrderAdd(StockInOrder stockInOrder) {
             }
 
+            @Override
+            public void omsCancelExecutionOrder(StockOutOrder stockOutOrder) {
+
+            }
+
+            @Override
+            public void omsAutoAssign(StockOutOrderDTO stockOutOrderDTO) {
+
+            }
+
+            @Override
+            public AjaxResult execution(StockOutOrderDTO stockOutOrderDTO) {
+                return AjaxResult.error(cause.getMessage());
+            }
+
             @Override
             public void omsInOrderAddDetail(List<InMaterialDetail> inMaterialDetails) {
             }
@@ -99,6 +114,23 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
                 tableDataInfo.setCode(500);
                 return tableDataInfo;
             }
+
+            @Override
+            public AjaxResult genPickingOrderByOms(StockOutOrderDTO stockOutOrderDTO) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult batchSignWms(SignatureBatchFeignDTO dto) {
+                log.error("WMS批量签名调用失败");
+                return AjaxResult.error("WMS批量签名调用失败：" + cause.getMessage());
+            }
+
+            @Override
+            public AjaxResult listLineManagement(String routeCode) {
+                log.error("OMS查询WMS线路管理失败, routeCode:{}", routeCode);
+                return AjaxResult.error("WMS线路管理查询失败：" + cause.getMessage());
+            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteXxlJobFeignFallbackFactory.java

@@ -0,0 +1,44 @@
+package com.mhd.system.api.factory;
+
+import com.mhd.common.core.domain.dto.BusinessDataPushDTO;
+import com.mhd.common.core.domain.entity.R;
+import com.mhd.common.core.domain.po.OrganizationPo;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.system.api.BmsServiceFeign;
+import com.mhd.system.api.ProductServiceFeign;
+import com.mhd.system.api.XxlJobServiceFeign;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+
+/**
+ * @Description
+ * @Author zg
+ * @Version 1.0
+ * @Date 2023/11/3 14:37
+ */
+@Component
+public class RemoteXxlJobFeignFallbackFactory implements FallbackFactory<XxlJobServiceFeign> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteXxlJobFeignFallbackFactory.class);
+
+    @Override
+    public XxlJobServiceFeign create(Throwable throwable) {
+        log.error("系统服务调用失败:{}", throwable.getMessage());
+        return new XxlJobServiceFeign() {
+
+            @Override
+            public R<Map<String, Object>> openFeignTest(String string) {
+                return null;
+            }
+        };
+    }
+}

mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java

@@ -40,6 +40,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -107,11 +108,14 @@ public class TokenLoginApplicationService {
         //租户一级组织ID
         SysTenantsPo sysTenantsPo = JSON.parseObject(JSON.toJSONString(topOrganizationIdR.get("data")), SysTenantsPo.class);
         Long topOrganizationId = sysTenantsPo.getOrganizationId();
+        // 获取用户选择的组织ID，未选则使用一级组织ID
+        Long selectedOrgId = loginDTO.getOrganizationId();
+        Long organizationId = (selectedOrgId != null) ? selectedOrgId : topOrganizationId;
         //获取用户信息，组装dto
         UserDTO userDTO = new UserDTO();
         userDTO.setUserPhone(userPhone);
         userDTO.setTopOrganizationId(topOrganizationId);
-        userDTO.setOrganizationId(topOrganizationId);
+        userDTO.setOrganizationId(organizationId);
         // 查询用户信息，查询组织下用户是否存在
         R<LoginUser> userResult = userServiceFeign.getUserByTopOrganizationUserPhone(userDTO, SecurityConstants.INNER);
         if (R.FAIL == userResult.getCode()) {
@@ -153,7 +157,8 @@ public class TokenLoginApplicationService {
             }else {
                 userDTO.setBusinessType(4);
             }
-            userDTO.setOrganizationName(sysTenantsPo.getOrganizationName());
+            userDTO.setOrganizationName(StringUtils.isNotBlank(loginDTO.getOrganizationName()) 
+                    ? loginDTO.getOrganizationName() : sysTenantsPo.getOrganizationName());
             userResult = userServiceFeign.registerAddUser(userDTO, SecurityConstants.INNER);
             userInfo = userResult.getData();
         } else {
@@ -174,34 +179,67 @@ public class TokenLoginApplicationService {
     }
 
     /**
-     * 注册
+     * App注册（手机号 + 注册短信验证码 + 密码）
      */
-    public void register(String username, String password) {
-        // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password)) {
-            throw new ServiceException("用户/密码必须填写");
+    public void register(LoginDTO loginDTO) {
+        String userPhone = loginDTO.getUserPhone();          // LoginDTO.java:27-28
+        String verificationCode = loginDTO.getVerificationCode(); // LoginDTO.java:30-31
+        String password = loginDTO.getPassword();
+
+        // 1. 基础校验
+        if (StringUtils.isAnyBlank(userPhone, verificationCode, password)) {
+            throw new ServiceException("手机号、验证码、密码必须填写");
         }
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-            throw new ServiceException("账户长度必须在2到20个字符之间");
-        }
-        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-            throw new ServiceException("密码长度必须在5到20个字符之间");
+        if (!RegexUtil.isPhoneLegal(userPhone)) {
+            throw new DigitalLogisticsException(UserError.USER_PHONE_REG_ERROR);
         }
 
-        // 注册用户信息
-        SysUser sysUser = new SysUser();
-        sysUser.setUserName(username);
-        sysUser.setNickName(username);
-        sysUser.setPassword(SecurityUtils.encryptPassword(password));
-        //TODO app注册没写
-        /*R<?> registerResult = userServiceFeign.registerUserInfo(sysUser, SecurityConstants.INNER);
+        // 2. 校验注册短信验证码（发送时写入 redis，见 SmsApplicationService.java:112, :165）
+        String key = CacheConstants.SMS_REGISTER + userPhone;   // "sms_register:" CacheConstants.java:51
+        Object cache = redisService.getCacheObject(key);
+        if (cache == null || !ObjectUtil.equal(String.valueOf(cache), verificationCode)) {
+            recordLogininfor(userPhone, Constants.LOGIN_FAIL, "注册验证码错误", 1);
+            throw new ServiceException("验证码错误或已过期");
+        }
 
+        // 3. 域名 → 一级组织（与 loginByVerificationCode :103-110 一致）
+        String path = loginDTO.getPath();
+        AjaxResult topOrganizationIdR = organizationServiceFeign.getOrganizationByPath(path);
+        if (ObjectUtil.isNull(topOrganizationIdR) || ObjectUtil.isNull(topOrganizationIdR.get("data"))) {
+            throw new ServiceException("组织不存在，请检查登录域名");
+        }
+        SysTenantsPo sysTenantsPo = JSON.parseObject(JSON.toJSONString(topOrganizationIdR.get("data")), SysTenantsPo.class);
+        Long topOrganizationId = sysTenantsPo.getOrganizationId();
+        Long selectedOrgId = loginDTO.getOrganizationId();      // LoginDTO.java:37-38，App 选择组织时传
+        Long organizationId = (selectedOrgId != null) ? selectedOrgId : topOrganizationId;
+
+        // 4. 手机号已注册则直接提示（UserMapper.xml:199 按 user_phone+top_organization_id 查）
+        UserDTO query = new UserDTO();
+        query.setUserPhone(userPhone);
+        query.setTopOrganizationId(topOrganizationId);
+        R<LoginUser> exist = userServiceFeign.getUserByTopOrganizationUserPhone(query, SecurityConstants.INNER);
+        if (exist != null && exist.getData() != null && exist.getData().getUserPo() != null) {
+            throw new ServiceException("该手机号已注册，请直接登录");
+        }
+
+        // 5. 创建用户（复用验证码登录自动注册的同一链路：
+        //    auth feign UserServiceFeign.java:47-48 → user-center UserAPI.java:332-336
+        //    → UserApplicationService.registerAddUser:1820-1927，内部已处理默认角色/YMS同步）
+        UserDTO userDTO = new UserDTO();
+        userDTO.setUserPhone(userPhone);
+        userDTO.setUserPassword(SecurityUtils.encryptPassword(password));
+        userDTO.setTopOrganizationId(topOrganizationId);
+        userDTO.setOrganizationId(organizationId);
+        userDTO.setOrganizationName(StringUtils.isNotBlank(loginDTO.getOrganizationName())
+                ? loginDTO.getOrganizationName() : sysTenantsPo.getOrganizationName());
+        R<LoginUser> registerResult = userServiceFeign.registerAddUser(userDTO, SecurityConstants.INNER);
         if (R.FAIL == registerResult.getCode()) {
             throw new ServiceException(registerResult.getMsg());
-        }*/
-//        recordLogininfor(username, Constants.REGISTER, "注册成功");
+        }
+
+        // 6. 注册成功后清掉验证码并记日志
+        redisService.deleteObject(key);
+        recordLogininfor(userPhone, Constants.REGISTER, "注册成功", 2);
     }
 
     /**
@@ -379,6 +417,10 @@ public class TokenLoginApplicationService {
                 throw new ServiceException("用户不存在/密码错误");
             }
         }
+        // 验证码登录时 userInfo.getUserPo() 可能为null，加保护
+        if (userInfo == null || userInfo.getUserPo() == null || userInfo.getUserPo().getOrganizationId() == null) {
+            throw new ServiceException("登录用户组织信息不完整，请联系管理员");
+        }
         R<OrganizationPo> organizationInfo = organizationServiceFeign.getInfoForIdList(userInfo.getUserPo().getOrganizationId());
         if (ObjectUtil.isNull(organizationInfo) || ObjectUtil.isNull(organizationInfo.getData())) {
             throw new ServiceException("登录用户组织不存在");
@@ -569,4 +611,29 @@ public class TokenLoginApplicationService {
         sysPasswordService.validateByWms(userPo, verificationCode, 1);
         return userInfo;
     }
+
+    /**
+     * 根据域名获取组织信息（免Token，供司机APP注册时选择组织用）
+     */
+    public AjaxResult getOrganizationByPath(String path) {
+        if (StringUtils.isBlank(path)) {
+            return AjaxResult.error("域名不能为空");
+        }
+        try {
+            AjaxResult result = organizationServiceFeign.getOrganizationByPath(path);
+            if (ObjectUtil.isNull(result) || ObjectUtil.isNull(result.get("data"))) {
+                return AjaxResult.error("未找到对应组织");
+            }
+            SysTenantsPo sysTenantsPo = JSON.parseObject(JSON.toJSONString(result.get("data")), SysTenantsPo.class);
+            Long topOrganizationId = sysTenantsPo.getOrganizationId();
+            // 返回一级组织ID和名称，前端可据此展示组织选择
+            Map<String, Object> data = new java.util.HashMap<>();
+            data.put("organizationId", topOrganizationId);
+            data.put("organizationName", sysTenantsPo.getOrganizationName());
+            return AjaxResult.success(data);
+        } catch (Exception e) {
+            log.error("获取组织信息失败, path={}", path, e);
+            return AjaxResult.error("获取组织信息失败：" + e.getMessage());
+        }
+    }
 }

mhd-auth/src/main/java/com/mhd/auth/app/interfaces/dto/LoginDTO.java

@@ -34,4 +34,10 @@ public class LoginDTO {
     @ApiModelProperty(name = "APP包名")
     private String appMark;
 
+    @ApiModelProperty(name = "组织ID（司机选择组织，不传默认一级组织）")
+    private Long organizationId;
+
+    @ApiModelProperty(name = "组织名称（司机选择组织时传入）")
+    private String organizationName;
+
 }

mhd-auth/src/main/java/com/mhd/auth/app/interfaces/facade/AppTokenController.java

@@ -9,11 +9,13 @@ import com.mhd.common.core.domain.po.UserPo;
 import com.mhd.common.core.utils.JwtUtils;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.web.controller.BaseController;
+import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.annotation.RepeatSubmit;
 import com.mhd.common.security.auth.AuthUtil;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,9 +72,18 @@ public class AppTokenController extends BaseController {
 
     @PostMapping("register")
     public R<?> register(@RequestBody LoginDTO loginDTO) {
-        // 用户注册
-        tokenLoginApplicationService.register(loginDTO.getUsername(), loginDTO.getPassword());
-        return R.ok();
+        // 用户注册（手机号+短信验证码+密码）
+        tokenLoginApplicationService.register(loginDTO);
+        return R.ok("注册成功");
+    }
+
+    /**
+     * 根据域名获取组织信息（免Token，供司机APP注册时选择组织用）
+     */
+    @ApiOperation("根据域名获取组织信息")
+    @GetMapping("/getOrganizationByPath/{path}")
+    public AjaxResult getOrganizationByPath(@PathVariable("path") String path) {
+        return tokenLoginApplicationService.getOrganizationByPath(path);
     }
 
 

mhd-auth/src/main/java/com/mhd/auth/system/controller/SsoAuthorizeController.java

@@ -0,0 +1,90 @@
+package com.mhd.auth.system.controller;
+
+import com.mhd.auth.system.service.SsoAuthorizeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ * SSO单点登录控制器
+ * 子系统端实现：接收中台传递的签名参数，验签后自动登录并重定向
+ *
+ * @author mhd
+ */
+@Slf4j
+@RestController
+@RequestMapping("/auth")
+@CrossOrigin
+public class SsoAuthorizeController {
+
+    @Autowired
+    private SsoAuthorizeService ssoAuthorizeService;
+
+    /**
+     * SSO单点登录授权接口
+     * 中台点击子系统链接后，将签名参数传递给此接口
+     * 验签通过后自动登录并重定向到前端页面，携带token
+     *
+     * @param signature 签名信息（Base64编码后再URL编码），签名源数据格式：appkey=xxx&account=xxx&timestamp=xxxxxx
+     * @param appkey    对方的应用key，值固定为nanguang
+     * @param account   账号
+     * @param timestamp 当前时间戳（毫秒），用于防止签名被盗用，超过24小时视为失效
+     */
+    @GetMapping("/sso-authorize")
+    public void ssoAuthorize(@RequestParam("signature") String signature,
+                             @RequestParam("appkey") String appkey,
+                             @RequestParam("account") String account,
+                             @RequestParam("timestamp") Long timestamp,
+                             HttpServletResponse response) throws IOException {
+        log.info("SSO单点登录请求, appkey={}, account={}, timestamp={}", appkey, account, timestamp);
+
+        String redirectUrl = ssoAuthorizeService.getRedirectUrl();
+
+        try {
+            // 1. 校验时间戳是否超过24小时，防止签名被盗用
+            long ONE_DAY_MILLIS = 24L * 60 * 60 * 1000;
+            long currentTime = System.currentTimeMillis();
+            if ((currentTime - timestamp) > ONE_DAY_MILLIS) {
+                log.warn("SSO签名已过期, appkey={}, account={}, timestamp={}, 距今{}小时",
+                        appkey, account, timestamp, (currentTime - timestamp) / (60 * 60 * 1000));
+                response.sendRedirect(redirectUrl + "?msg=" + URLEncoder.encode("登录失败：签名已超过24小时，请重新发起", StandardCharsets.UTF_8.name()));
+                return;
+            }
+
+            // 2. 构造签名源数据（包含timestamp）
+            String sourceData = "appkey=" + appkey + "&account=" + account + "&timestamp=" + timestamp;
+
+            // 3. 验证签名
+            boolean verifyResult = ssoAuthorizeService.verifySignature(sourceData, signature);
+            if (!verifyResult) {
+                log.warn("SSO验签失败, appkey={}, account={}, timestamp={}", appkey, account, timestamp);
+                response.sendRedirect(redirectUrl + "?msg=" + URLEncoder.encode("登录失败：签名验证不通过", StandardCharsets.UTF_8.name()));
+                return;
+            }
+
+            // 4. 验签通过，使用account进行登录，获取token
+            Map<String, Object> loginResult = ssoAuthorizeService.ssoLogin(account);
+            String accessToken = (String) loginResult.get("access_token");
+
+            // 5. 重定向到前端页面，token通过URL参数传递
+            //    前端页面需读取URL中的token参数并存入localStorage
+            log.info("SSO单点登录成功, account={}", account);
+            log.info("SSO单点登录成功, account={}, token={} , redirectUrl={}", account, accessToken, redirectUrl);
+            response.sendRedirect(redirectUrl + "?token=" + URLEncoder.encode(accessToken, StandardCharsets.UTF_8.name()));
+
+        } catch (Exception e) {
+            log.error("SSO单点登录异常, appkey={}, account={}, timestamp={}", appkey, account, timestamp, e);
+            response.sendRedirect(redirectUrl + "?msg=" + URLEncoder.encode("登录失败：" + e.getMessage(), StandardCharsets.UTF_8.name()));
+        }
+    }
+}

mhd-auth/src/main/java/com/mhd/auth/system/service/SsoAuthorizeService.java

@@ -0,0 +1,200 @@
+package com.mhd.auth.system.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.mhd.common.core.constant.CacheConstants;
+import com.mhd.common.core.constant.Constants;
+import com.mhd.common.core.constant.SecurityConstants;
+import com.mhd.common.core.domain.entity.R;
+import com.mhd.common.core.domain.po.OrganizationPo;
+import com.mhd.common.core.domain.po.RolePO;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.enums.UserStatus;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.utils.ServletUtils;
+import com.mhd.common.core.utils.ip.IpUtil;
+import com.mhd.common.core.utils.ip.IpUtils;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.log.service.AsyncLogService;
+import com.mhd.common.security.service.TokenService;
+import com.mhd.system.api.SystemServiceFeign;
+import com.mhd.system.api.UserServiceFeign;
+import com.mhd.system.api.domain.UserDTO;
+import com.mhd.system.api.domain.UserUpdateDTO;
+import com.mhd.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.util.Base64;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * SSO单点登录服务
+ *
+ * @author mhd
+ */
+@Slf4j
+@Service
+public class SsoAuthorizeService {
+
+    @Value("${sso.public-key}")
+    private String publicKeyStr;
+
+    @Value("${sso.redirect-url}")
+    private String redirectUrl;
+
+    @Resource
+    private UserServiceFeign userServiceFeign;
+
+    @Resource
+    private TokenService tokenService;
+
+    @Autowired
+    private AsyncLogService asyncLogService;
+
+    @Autowired
+    private SystemServiceFeign systemServiceFeign;
+
+    @Resource
+    private com.mhd.auth.app.infrastructure.feign.OrganizationServiceFeign organizationServiceFeign;
+
+    /**
+     * 验证RSA签名
+     *
+     * @param sourceData    签名源数据，格式：appkey=xxx&account=xxx&timestamp=xxxxxx
+     * @param signatureStr  Base64编码的签名（可能经过URL编码）
+     * @return 验签结果
+     */
+    public boolean verifySignature(String sourceData, String signatureStr) {
+        try {
+            // Spring @RequestParam 已自动完成 URL 解码，此处直接 Base64 解码即可
+            byte[] signatureBytes = Base64.getDecoder().decode(signatureStr);
+
+            PublicKey publicKey = generatePublicKey(publicKeyStr);
+            Signature signature = Signature.getInstance("SHA256withRSA");
+            signature.initVerify(publicKey);
+            signature.update(sourceData.getBytes("UTF-8"));
+            return signature.verify(signatureBytes);
+        } catch (Exception e) {
+            log.error("SSO验签失败, sourceData={}, signature={}", sourceData, signatureStr, e);
+            return false;
+        }
+    }
+
+    /**
+     * 根据公钥字符串生成PublicKey对象
+     */
+    private PublicKey generatePublicKey(String keyStr) throws Exception {
+        // 去除头尾标记和空白字符
+        String publicKeyContent = keyStr
+                .replace("-----BEGIN PUBLIC KEY-----", "")
+                .replace("-----END PUBLIC KEY-----", "")
+                .replaceAll("\\s+", "");
+        byte[] keyBytes = Base64.getDecoder().decode(publicKeyContent);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        java.security.spec.X509EncodedKeySpec keySpec = new java.security.spec.X509EncodedKeySpec(keyBytes);
+        return keyFactory.generatePublic(keySpec);
+    }
+
+    /**
+     * SSO登录：根据account查找用户并创建token
+     *
+     * @param account 账号
+     * @return 包含token等信息的Map
+     */
+    public Map<String, Object> ssoLogin(String account) {
+        // 根据账号查找用户（SSO登录不区分组织，仅通过userAccount查询）
+        R<LoginUser> userResult = userServiceFeign.getUserByUserAccount(account);
+        if (R.FAIL == userResult.getCode()) {
+            throw new ServiceException(userResult.getMsg());
+        }
+        if (userResult.getData() == null) {
+            throw new ServiceException("SSO登录用户不存在：" + account);
+        }
+
+        LoginUser userInfo = userResult.getData();
+        UserPo userPo = userInfo.getUserPo();
+
+        // 校验用户状态
+        if (userPo == null) {
+            throw new ServiceException("SSO登录用户信息异常：" + account);
+        }
+        // 删除标记
+        if (UserStatus.DELETED.getCode().equals(String.valueOf(userPo.getDelFlag()))) {
+            throw new ServiceException("对不起，您的账号：" + account + " 已被删除");
+        }
+        // 用户状态
+        if (UserStatus.DELETED.getCode().equals(String.valueOf(userPo.getUserStatus()))) {
+            throw new ServiceException("对不起，您的账号：" + account + " 已停用");
+        }
+
+        // 获取组织信息
+        com.mhd.common.core.domain.entity.R<OrganizationPo> organizationInfo = organizationServiceFeign.getInfoForIdList(userPo.getOrganizationId());
+        if (ObjectUtil.isNull(organizationInfo) || ObjectUtil.isNull(organizationInfo.getData())) {
+            throw new ServiceException("登录用户组织不存在");
+        }
+        userInfo.setOrganizationPo(organizationInfo.getData());
+
+        // 查询用户角色
+        AjaxResult roleListAjaxResult = userServiceFeign.getRoleListByUserId(userPo.getUserId());
+        if ("200".equals(String.valueOf(roleListAjaxResult.get("code"))) && ObjectUtil.isNotNull(roleListAjaxResult.get("data"))) {
+            List<RolePO> rolePOS = JSONUtil.toList(JSONUtil.toJsonStr(roleListAjaxResult.get("data")), RolePO.class);
+            if (rolePOS != null && !rolePOS.isEmpty()) {
+                userInfo.setRoleList(rolePOS.stream().map(RolePO::getRoleName).collect(Collectors.toList()));
+                userInfo.setRoleIdList(rolePOS.stream().map(RolePO::getRoleId).collect(Collectors.toList()));
+            }
+        }
+
+        // 更新登录信息
+        UserUpdateDTO userUpdateDTO = new UserUpdateDTO();
+        userUpdateDTO.setLastLoginTime(new Date());
+        userUpdateDTO.setLastLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        userUpdateDTO.setUserName(account);
+        userServiceFeign.updateWhenLogin(userUpdateDTO, SecurityConstants.INNER);
+
+        // 创建token
+        Map<String, Object> result = tokenService.createTokenApi(userInfo);
+
+        // 记录登录日志
+        recordLogininfor(userPo, Constants.LOGIN_SUCCESS, "SSO单点登录成功", 1);
+
+        return result;
+    }
+
+    /**
+     * 记录登录信息
+     */
+    private void recordLogininfor(UserPo userPo, String status, String message, Integer behaviorType) {
+        com.mhd.system.api.domain.SysLogininforPo logininfor = new com.mhd.system.api.domain.SysLogininforPo();
+        logininfor.setUserAccount(userPo.getUserAccount());
+        logininfor.setUserName(userPo.getUserName());
+        logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        logininfor.setLocation(StrUtil.isNotEmpty(logininfor.getIpaddr()) ? IpUtil.getLocationSplicing(logininfor.getIpaddr()) : "");
+        logininfor.setBehaviorType(behaviorType);
+        logininfor.setMsg(message);
+        logininfor.setOrganizationId(userPo.getOrganizationId());
+        logininfor.setOrganizationName(userPo.getOrganizationName());
+        logininfor.setTopOrganizationId(userPo.getTopOrganizationId());
+        logininfor.setAccessTime(cn.hutool.core.date.DateUtil.date());
+        if (org.apache.commons.lang3.StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
+            logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS);
+        } else if (Constants.LOGIN_FAIL.equals(status)) {
+            logininfor.setStatus(Constants.LOGIN_FAIL_STATUS);
+        }
+        asyncLogService.saveLogininfor(logininfor);
+    }
+
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+}

mhd-auth/src/main/java/com/mhd/auth/system/service/SysLoginService.java

@@ -550,11 +550,11 @@ public class SysLoginService {
             throw new ServiceException("请输入手机号和短信验证码");
         }
 
-        //调用工具类校验，校验手机号格式错误
-        if (!RegexUtil.isPhoneLegal(userPhone)) {
-            recordLogininfor(userPhone, Constants.LOGIN_FAIL, UserError.USER_PHONE_REG_ERROR.errmsg(), 1);
-            throw new DigitalLogisticsException(UserError.USER_PHONE_REG_ERROR);
-        }
+//        //调用工具类校验，校验手机号格式错误
+//        if (!RegexUtil.isPhoneLegal(userPhone)) {
+//            recordLogininfor(userPhone, Constants.LOGIN_FAIL, UserError.USER_PHONE_REG_ERROR.errmsg(), 1);
+//            throw new DigitalLogisticsException(UserError.USER_PHONE_REG_ERROR);
+//        }
 
         //根据域名获取一级组织ID
         AjaxResult topOrganizationIdR = organizationServiceFeign.getOrganizationByPath(path, SecurityConstants.INNER);

mhd-auth/src/main/java/com/mhd/auth/system/service/SysPasswordService.java

@@ -28,6 +28,7 @@ import com.mhd.common.redis.service.RedisService;
 import com.mhd.common.security.utils.password.PasswordUtil;
 import com.mhd.system.api.RemoteLogService;
 import com.mhd.system.api.domain.SysLogininforPo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -39,6 +40,7 @@ import javax.annotation.Resource;
  * @description: 登录密码方法
  * @date 2023/12/26 15:33
  **/
+@Slf4j
 @Component
 public class SysPasswordService
 {
@@ -76,29 +78,31 @@ public class SysPasswordService
         if (retryCount == null) {
             retryCount = 0;
         }
-        //TODO 从三方配置表中取值
-        SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO = new SysDepartInterfaceInfoDTO();
-        sysDepartInterfaceInfoDTO.setTopOrganizationId(userPo.getTopOrganizationId());
-        sysDepartInterfaceInfoDTO.setInterfaceType("login");
-        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("maxRetryCount");
-        List<SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPos = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
-        if (sysDepartInterfaceInfoPos.isEmpty()){
-            String errMsg = "缺少登录信息配置，请联系管理员";
-            recordLogininfor(userPo, Constants.LOGIN_FAIL, errMsg, 1);
-            throw new ServiceException(errMsg);
+        //TODO 从三方配置表中取值（失败时用默认值，保证登录错误提示可用）
+        int maxRetryCount = 5;     // 默认：密码错5次锁定
+        long lockTime = 30L;       // 默认：锁定30分钟
+        try {
+            SysDepartInterfaceInfoDTO dto = new SysDepartInterfaceInfoDTO();
+            dto.setTopOrganizationId(userPo.getTopOrganizationId());
+            dto.setInterfaceType("login");
+            dto.setInterfaceTypeKey("maxRetryCount");
+            List<SysDepartInterfaceInfoPo> pos = thirdPartyServiceFeign.queryListByFeign(dto);
+            if (pos != null && !pos.isEmpty()) {
+                maxRetryCount = Integer.parseInt(pos.get(0).getInterfaceTypeValue());
+            } else {
+                log.warn("组织[{}]缺少登录配置 login/maxRetryCount，使用默认值{}", userPo.getTopOrganizationId(), maxRetryCount);
+            }
+            dto.setInterfaceTypeKey("lockTime");
+            pos = thirdPartyServiceFeign.queryListByFeign(dto);
+            if (pos != null && !pos.isEmpty()) {
+                lockTime = Long.parseLong(pos.get(0).getInterfaceTypeValue());
+            } else {
+                log.warn("组织[{}]缺少登录配置 login/lockTime，使用默认值{}", userPo.getTopOrganizationId(), lockTime);
+            }
+        } catch (Exception e) {
+            log.warn("读取登录配置失败，使用默认重试策略", e);
         }
-        SysDepartInterfaceInfoPo sysDepartInterfaceInfoPo = sysDepartInterfaceInfoPos.get(0);
-        Integer maxRetryCount = Integer.valueOf(sysDepartInterfaceInfoPo.getInterfaceTypeValue());
-        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("lockTime");
-        sysDepartInterfaceInfoPos = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
-        if (sysDepartInterfaceInfoPos.isEmpty()){
-            String errMsg = "缺少登录信息配置，请联系管理员";
-            recordLogininfor(userPo, Constants.LOGIN_FAIL, errMsg, 1);
-            throw new ServiceException(errMsg);
-        }
-        sysDepartInterfaceInfoPo = sysDepartInterfaceInfoPos.get(0);
-        Long lockTime = Long.valueOf(sysDepartInterfaceInfoPo.getInterfaceTypeValue());
-        if (retryCount >= maxRetryCount){
+        if (retryCount >= maxRetryCount) {
             String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
             recordLogininfor(userPo, Constants.LOGIN_FAIL, errMsg, 1);
             throw new ServiceException(errMsg);

mhd-auth/src/main/resources/bootstrap.yml

@@ -12,9 +12,10 @@ spring:
   cloud:
     nacos:
       discovery:
-#        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-        server-addr: 10.33.0.129:6010
+#        server-addr: 10.33.0.129:6010
+#        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境
@@ -22,9 +23,10 @@ spring:
 #        username: nacos
 #        password: manhuoda@2023
       config:
-#        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848
+#        server-addr: 10.102.192.31:6848
         # 测试环境配置 容器名+端口号
-        server-addr: 10.33.0.129:6010
+#        server-addr: 10.33.0.129:6010
         # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.102.192.5:6848
         username: nacos
@@ -35,3 +37,19 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+# SSO单点登录配置
+sso:
+  # RSA公钥（由中台openssl私钥导出）
+  public-key: |
+    -----BEGIN PUBLIC KEY-----
+    MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA62dYkl2Nvy2wW9028dQ7
+    HdxFNhwEriFNzFMFq+m1jTvZWdU6e9a1iCGWTVV2fTo4PWSyhjWyzv2ZBEuanWBq
+    y/bfh/jOTjT/tlWvMeJZ1TV4suCbigHq5TGxDsY6ZC6if9ULhU3NWkgnPNn6HfO9
+    NVvBTfx9MgWtCtT33kq30KgxC6LqVdCe08+gD0KB3df0DK8OJorVFfxYVc7TjGEL
+    xqUuE7PcgZgDb8KvdgO66OxBqFIB0qfc73oALKGoq/8kvjrqE/amaIZPv3jE2Rc7
+    0rIhGHrFcoA3W01nNRGQKY/E/VKOGBn/uDNdi5iMXsFjKxiBbXB07bBxdhUH7698
+    AwIDAQAB
+    -----END PUBLIC KEY-----
+  # SSO登录成功后跳转的前端页面地址
+  redirect-url: "https://diglog.namkwong.com.mo/main_app/sso"

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/mapper/BiPlatformRealDataMapper.java

@@ -0,0 +1,46 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.mapper;
+
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO;
+
+import java.util.List;
+
+/**
+ * 月台监测-真实数据 Mapper
+ * 数据来源：TEST_NGWL_YMS 库（达梦，跨库访问）
+ * 注：列名按达梦默认大写规则；若实际库中小写请反馈调整
+ */
+public interface BiPlatformRealDataMapper {
+
+    /** 作业车辆状态列表 */
+    List<RealPlatformVehiclePO> queryVehicles();
+
+    /** 月台实时概览（总数 / 当前作业中） */
+    RealPlatformOverviewPO queryPlatformOverview();
+
+    /** 今日作业任务数 */
+    Long countTodayTasks();
+
+    /** 车辆状态统计（今日） */
+    RealVehicleStatusPO queryVehicleStatusToday();
+
+    /** 本月任务量 */
+    Long countMonthTasks();
+
+    /** 任务负荷（今日 24 小时） */
+    List<RealTaskLoadPO> queryTaskLoadToday();
+
+    /** 今日预约-业务类型统计（按 businessName 分组统计今日预约数量） */
+    List<RealBusinessTypeStatPO> queryTodayBusinessTypeStats();
+
+    /** 月台监控-按楼层统计月台车辆（楼层、月台数量、今日预约车辆、当前作业车辆） */
+    List<RealPlatformFloorStatPO> queryPlatformFloorStats();
+
+    /** 月台管理列表（YMS qms_window_info，含机构/鹤位/状态/楼层/UUID 等完整信息） */
+    List<RealPlatformInfoPO> queryPlatformInfoList();
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealBusinessTypeStatPO.java

@@ -0,0 +1,20 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 今日预约-业务类型统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
+ * 按业务类型分组统计今日预约数量
+ */
+@Data
+public class RealBusinessTypeStatPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 业务类型名称（qms_main_business.businessName） */
+    private String businessName;
+
+    /** 今日预约数量 */
+    private Long count;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformFloorStatPO.java

@@ -0,0 +1,26 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 月台监控-月台车辆统计（按楼层分组）
+ * 数据来源：TEST_NGWL_YMS.QMS_WINDOW_INFO（楼层+月台）与 QMS_MAIN_BUSINESS（当日预约/作业）
+ */
+@Data
+public class RealPlatformFloorStatPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 楼层（从叫号月台 WINDOW_NAME 解析，如 S1-01 -> F1） */
+    private String floorNo;
+
+    /** 该楼层的月台数量 */
+    private Long platformCount;
+
+    /** 今日预约车辆数（按 WINDOW_NAME 关联楼层） */
+    private Long todayReservedVehicles;
+
+    /** 当前作业车辆数（FLOW_STATUS IN 5,6,7,8,9,10） */
+    private Long operatingVehicles;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformInfoPO.java

@@ -0,0 +1,59 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 月台管理列表（真实数据，来自 TEST_NGWL_YMS.QMS_WINDOW_INFO）
+ * 对应 YMS qms_window_info 月台/鹤位窗口表
+ */
+@Data
+public class RealPlatformInfoPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 机构代码（org_no） */
+    private String orgNo;
+
+    /** 机构名称（dept_name） */
+    private String deptName;
+
+    /** 鹤位号/月台号（window_number） */
+    private String windowNumber;
+
+    /** 鹤位名称/月台名称（window_name） */
+    private String windowName;
+
+    /** 优先级别（priority_set） */
+    private String prioritySet;
+
+    /** 鹤位状态/月台状态（running_status） */
+    private String runningStatus;
+
+    /** uuid */
+    private String uuid;
+
+    /** 鹤位屏名字集合/绑定月台屏（berr_names） */
+    private String berrNames;
+
+    /** 最新业务状态（new_flow_status） */
+    private String newFlowStatus;
+
+    /** 月台图片（guide_images） */
+    private String guideImages;
+
+    /** 月台楼层（platform_floor） */
+    private String platformFloor;
+
+    /** 作业状态 0-空闲 1-占用（job_status） */
+    private Integer jobStatus;
+
+    /** 创建人（create_by） */
+    private String createBy;
+
+    /** 创建时间（create_time） */
+    private String createTime;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformOverviewPO.java

@@ -0,0 +1,18 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 月台实时概览（真实数据，来自 TEST_NGWL_YMS.QMS_WINDOW_INFO）
+ */
+@Data
+public class RealPlatformOverviewPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 月台总数 */
+    private Long totalPlatforms;
+
+    /** 当前作业中（月台作业状态=占用） */
+    private Long operatingPlatforms;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformVehiclePO.java

@@ -0,0 +1,30 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 月台监测-作业车辆（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS 等）
+ */
+@Data
+public class RealPlatformVehiclePO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 车牌号（qms_main_business.CARNO） */
+    private String plateNumber;
+
+    /** 流程状态（qms_main_business.FLOWSTATUS） */
+    private String status;
+
+    /** 叫号月台（qms_queue_list.WINDOWNAME） */
+    private String platformId;
+
+    /** 月台作业时长，分钟（EXITTIME - ENTRYTIME） */
+    private Long platformDuration;
+
+    /** 预约申请时间（qms_main_business.CREATE_TIME） */
+    private String appointmentTime;
+
+    /** 作业楼层（qms_window_info.PLATFORMFLOOR） */
+    private String workFloor;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealTaskLoadPO.java

@@ -0,0 +1,18 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 任务负荷统计（按小时，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
+ */
+@Data
+public class RealTaskLoadPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 0-23 小时 */
+    private Integer hourOfDay;
+
+    /** 该小时段任务数 */
+    private Long taskCount;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealVehicleStatusPO.java

@@ -0,0 +1,24 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 作业车辆状态统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
+ */
+@Data
+public class RealVehicleStatusPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 今日预约车辆 */
+    private Long todayReservedVehicles;
+
+    /** 当前未签到 */
+    private Long notCheckedIn;
+
+    /** 当前作业中 */
+    private Long operatingVehicles;
+
+    /** 作业完成 */
+    private Long completedVehicles;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java

@@ -0,0 +1,350 @@
+package com.mhd.bi.domain.biPlatformRealData.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mhd.bi.domain.biPlatformRealData.repository.mapper.BiPlatformRealDataMapper;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO;
+import com.mhd.bi.domain.biPlatformSurveillance.repository.mapper.BiPlatformSurveillanceReportMapper;
+import com.mhd.bi.domain.biSnapshotSync.repository.mapper.BiSnapshotWriteMapper;
+import com.mhd.bi.domain.biSnapshotSync.support.BiSnapshotWeeklyRandomDataBuilder;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformVehicleItemVO;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskLoadItemVO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Random;
+
+/**
+ * 月台监测-真实数据业务层（封装 YMS 跨库查询）
+ * 注：列名大小写、字段类型需以实际库为准；若 YMS 库无数据/无权限，相关方法应返回空/0，不影响写死字段写入快照
+ */
+@Slf4j
+@Service
+public class BiPlatformRealDataService {
+
+    @Resource
+    private BiPlatformRealDataMapper biPlatformRealDataMapper;
+
+    @Resource
+    private BiSnapshotWriteMapper biSnapshotWriteMapper;
+
+    @Resource
+    private BiPlatformSurveillanceReportMapper biPlatformSurveillanceReportMapper;
+
+    @Resource
+    private ObjectMapper objectMapper;
+
+    private static final String REMARK_REALTIME = "realtime platform-surveillance";
+
+    /**
+     * 实时组装月台监测数据；仅当真实业务数据（YMS 库查出的字段）发生变化时，
+     * 才覆盖更新 BI_PLATFORM_SURVEILLANCE_SNAPSHOT 快照表最新一条后返回。
+     * 写死字段变化不触发更新；表中尚无记录时插入一条兜底。
+     */
+    public PlatformSurveillanceVO buildRealTimePlatformSurveillanceAndPersist() {
+        PlatformSurveillanceVO vo = buildRealTimePlatformSurveillance();
+        try {
+            String fullJson = objectMapper.writeValueAsString(vo);
+            String fingerprint = realDataFingerprint(vo);
+
+            String latestJson = biPlatformSurveillanceReportMapper.selectLatestPayloadJson();
+            if (StringUtils.isNotBlank(latestJson)) {
+                PlatformSurveillanceVO latestVo = objectMapper.readValue(latestJson.trim(), PlatformSurveillanceVO.class);
+                if (Objects.equals(fingerprint, realDataFingerprint(latestVo))) {
+                    log.info("BI 月台监测真实业务数据未变化，跳过落库");
+                    return vo;
+                }
+            }
+
+            int rows = biSnapshotWriteMapper.updateLatestPlatformSurveillanceSnapshot(fullJson, REMARK_REALTIME);
+            if (rows < 1) {
+                // 表中无最新记录可更新，插入一条兜底
+                biSnapshotWriteMapper.insertPlatformSurveillanceSnapshot(fullJson, REMARK_REALTIME);
+            }
+            log.info("BI 月台监测实时数据已落库(覆盖最新, 数据变化), affectedRows={}", rows);
+        } catch (Exception e) {
+            log.error("BI 月台监测实时数据落库失败", e);
+        }
+        return vo;
+    }
+
+    /**
+     * 提取月台监测的「真实业务数据」指纹（仅含 YMS 库查出的字段），用于判断业务数据是否变化。
+     * 写死/随机字段不纳入指纹，故其变化不会触发更新。
+     */
+    private String realDataFingerprint(PlatformSurveillanceVO vo) throws Exception {
+        Map<String, Object> fp = new LinkedHashMap<>();
+        if (vo.getPlatformOverview() != null) {
+            fp.put("totalPlatforms", vo.getPlatformOverview().getTotalPlatforms());
+            fp.put("operatingPlatforms", vo.getPlatformOverview().getOperatingPlatforms());
+            fp.put("todayTasks", vo.getPlatformOverview().getTodayTasks());
+        }
+        if (vo.getVehicleStatus() != null) {
+            fp.put("todayReservedVehicles", vo.getVehicleStatus().getTodayReservedVehicles());
+            fp.put("notCheckedIn", vo.getVehicleStatus().getNotCheckedIn());
+            fp.put("operatingVehicles", vo.getVehicleStatus().getOperatingVehicles());
+            fp.put("completedVehicles", vo.getVehicleStatus().getCompletedVehicles());
+        }
+        if (vo.getMonthlyTaskStatistics() != null) {
+            fp.put("taskTotal", vo.getMonthlyTaskStatistics().getTaskTotal());
+        }
+        if (vo.getVehicles() != null) {
+            List<Map<String, Object>> vehicles = new ArrayList<>();
+            for (PlatformVehicleItemVO v : vo.getVehicles()) {
+                Map<String, Object> m = new LinkedHashMap<>();
+                m.put("appointmentTime", v.getAppointmentTime());
+                m.put("workFloor", v.getWorkFloor());
+                m.put("plateNumber", v.getPlateNumber());
+                m.put("status", v.getStatus());
+                m.put("platformId", v.getPlatformId());
+                m.put("platformDuration", v.getPlatformDuration());
+                vehicles.add(m);
+            }
+            fp.put("vehicles", vehicles);
+        }
+        if (vo.getTaskLoadStatistics() != null) {
+            List<Map<String, Object>> loads = new ArrayList<>();
+            for (TaskLoadItemVO item : vo.getTaskLoadStatistics()) {
+                Map<String, Object> m = new LinkedHashMap<>();
+                m.put("time", item.getTime());
+                m.put("taskCount", item.getTaskCount());
+                loads.add(m);
+            }
+            fp.put("taskLoadStatistics", loads);
+        }
+        return objectMapper.writeValueAsString(fp);
+    }
+
+    public List<RealPlatformVehiclePO> queryVehicles() {
+        try {
+            return biPlatformRealDataMapper.queryVehicles();
+        } catch (Exception e) {
+            log.error("【YMS】查询作业车辆列表失败: {}", e.getMessage(), e);
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    public RealPlatformOverviewPO queryPlatformOverview() {
+        try {
+            RealPlatformOverviewPO po = biPlatformRealDataMapper.queryPlatformOverview();
+            if (po == null) {
+                po = new RealPlatformOverviewPO();
+            }
+            if (po.getTotalPlatforms() == null) po.setTotalPlatforms(0L);
+            if (po.getOperatingPlatforms() == null) po.setOperatingPlatforms(0L);
+            return po;
+        } catch (Exception e) {
+            log.error("【YMS】查询月台概览失败: {}", e.getMessage(), e);
+            RealPlatformOverviewPO po = new RealPlatformOverviewPO();
+            po.setTotalPlatforms(0L);
+            po.setOperatingPlatforms(0L);
+            return po;
+        }
+    }
+
+    public long countTodayTasks() {
+        try {
+            Long n = biPlatformRealDataMapper.countTodayTasks();
+            return n == null ? 0L : n;
+        } catch (Exception e) {
+            log.error("【YMS】统计今日作业任务失败: {}", e.getMessage(), e);
+            return 0L;
+        }
+    }
+
+    public RealVehicleStatusPO queryVehicleStatusToday() {
+        try {
+            RealVehicleStatusPO po = biPlatformRealDataMapper.queryVehicleStatusToday();
+            if (po == null) po = new RealVehicleStatusPO();
+            if (po.getTodayReservedVehicles() == null) po.setTodayReservedVehicles(0L);
+            if (po.getNotCheckedIn() == null) po.setNotCheckedIn(0L);
+            if (po.getOperatingVehicles() == null) po.setOperatingVehicles(0L);
+            if (po.getCompletedVehicles() == null) po.setCompletedVehicles(0L);
+            return po;
+        } catch (Exception e) {
+            log.error("【YMS】统计车辆状态失败: {}", e.getMessage(), e);
+            RealVehicleStatusPO po = new RealVehicleStatusPO();
+            po.setTodayReservedVehicles(0L);
+            po.setNotCheckedIn(0L);
+            po.setOperatingVehicles(0L);
+            po.setCompletedVehicles(0L);
+            return po;
+        }
+    }
+
+    public long countMonthTasks() {
+        try {
+            Long n = biPlatformRealDataMapper.countMonthTasks();
+            return n == null ? 0L : n;
+        } catch (Exception e) {
+            log.error("【YMS】统计本月任务量失败: {}", e.getMessage(), e);
+            return 0L;
+        }
+    }
+
+    public List<RealTaskLoadPO> queryTaskLoadToday() {
+        try {
+            return biPlatformRealDataMapper.queryTaskLoadToday();
+        } catch (Exception e) {
+            log.error("【YMS】统计任务负荷失败: {}", e.getMessage(), e);
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    /**
+     * 今日预约-业务类型统计：按业务类型分组统计今日预约数量。
+     * 例：今日预约航空打板 3 条 → 返回 {businessName:"航空打板", count:3}
+     */
+    public List<RealBusinessTypeStatPO> queryTodayBusinessTypeStats() {
+        try {
+            return biPlatformRealDataMapper.queryTodayBusinessTypeStats();
+        } catch (Exception e) {
+            log.error("【YMS】统计今日业务类型失败: {}", e.getMessage(), e);
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    /**
+     * 月台监控-按楼层统计月台车辆：返回 {floorNo, platformCount, todayReservedVehicles, operatingVehicles}
+     * 实时查 YMS 库，不落库。
+     */
+    public List<RealPlatformFloorStatPO> queryPlatformFloorStats() {
+        try {
+            return biPlatformRealDataMapper.queryPlatformFloorStats();
+        } catch (Exception e) {
+            log.error("【YMS】月台监控按楼层统计失败: {}", e.getMessage(), e);
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    /**
+     * 月台管理列表：实时查 YMS qms_window_info，返回月台/鹤位窗口完整信息，不落库。
+     */
+    public List<RealPlatformInfoPO> queryPlatformInfoList() {
+        try {
+            return biPlatformRealDataMapper.queryPlatformInfoList();
+        } catch (Exception e) {
+            log.error("【YMS】查询月台管理列表失败: {}", e.getMessage(), e);
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    /**
+     * 实时组装月台监测数据：原则「有真实数据源用真实，无真实数据源用写死模拟」。
+     * 有真实数据源的字段（vehicles / platformOverview / vehicleStatus / taskLoad / taskTotal）
+     * 无条件用 YMS 真实查询覆盖，真实为空即为空，不用模板兜底；
+     * 无真实数据源的字段（效率统计、趋势、告警、任务类型等）保留模板写死值。
+     * 每次调用实时查库，不经过快照表。
+     */
+    public PlatformSurveillanceVO buildRealTimePlatformSurveillance() {
+        // 固定种子生成写死模板：仅用于没有真实数据源的字段
+        Random r = new Random(20260825L);
+        PlatformSurveillanceVO template = BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(r);
+
+        // 作业车辆列表：真实数据源，无条件覆盖（真实为空则返回空列表，不用模板模拟）
+        List<RealPlatformVehiclePO> realVehicles = queryVehicles();
+        List<PlatformVehicleItemVO> vehicleVos = new ArrayList<>();
+        for (RealPlatformVehiclePO rv : realVehicles) {
+            PlatformVehicleItemVO v = new PlatformVehicleItemVO();
+            v.setAppointmentTime(rv.getAppointmentTime());
+            v.setWorkFloor(rv.getWorkFloor());
+            v.setPlateNumber(rv.getPlateNumber());
+            v.setStatus(translateFlowStatus(rv.getStatus()));
+            v.setPlatformId(rv.getPlatformId());
+            v.setPlatformDuration(rv.getPlatformDuration() == null ? 0 : rv.getPlatformDuration().intValue());
+            vehicleVos.add(v);
+        }
+        template.setVehicles(vehicleVos);
+
+        // 月台实时概览：真实数据源，无条件覆盖
+        if (template.getPlatformOverview() != null) {
+            RealPlatformOverviewPO ov = queryPlatformOverview();
+            int total = ov.getTotalPlatforms().intValue();
+            int occ = ov.getOperatingPlatforms().intValue();
+            double rate = total > 0 ? Math.round(((double) occ / total) * 100.0 * 100.0) / 100.0 : 0d;
+            template.getPlatformOverview().setTotalPlatforms(total);
+            template.getPlatformOverview().setOperatingPlatforms(occ);
+            template.getPlatformOverview().setCurrentOccupancyRate(rate);
+            template.getPlatformOverview().setTodayTasks((int) countTodayTasks());
+        }
+
+        // 作业车辆状态统计：真实数据源，无条件覆盖
+        if (template.getVehicleStatus() != null) {
+            RealVehicleStatusPO vs = queryVehicleStatusToday();
+            template.getVehicleStatus().setTodayReservedVehicles(vs.getTodayReservedVehicles().intValue());
+            template.getVehicleStatus().setNotCheckedIn(vs.getNotCheckedIn().intValue());
+            template.getVehicleStatus().setOperatingVehicles(vs.getOperatingVehicles().intValue());
+            template.getVehicleStatus().setCompletedVehicles(vs.getCompletedVehicles().intValue());
+        }
+
+        // 本月任务统计：taskTotal 有真实数据源无条件覆盖；YoY 等无真实数据源保留模板写死值
+        if (template.getMonthlyTaskStatistics() != null) {
+            template.getMonthlyTaskStatistics().setTaskTotal((int) countMonthTasks());
+        }
+
+        // 任务负荷：有真实数据源；真实为空则清空不用模板模拟，有数据则按真实小时覆盖
+        List<RealTaskLoadPO> loads = queryTaskLoadToday();
+        if (loads.isEmpty()) {
+            template.setTaskLoadStatistics(new ArrayList<>());
+        } else if (template.getTaskLoadStatistics() != null) {
+            Map<Integer, Long> hourMap = new HashMap<>();
+            for (RealTaskLoadPO l : loads) {
+                hourMap.put(l.getHourOfDay(), l.getTaskCount());
+            }
+            for (TaskLoadItemVO item : template.getTaskLoadStatistics()) {
+                Integer hour = parseHourFromLabel(item.getTime());
+                if (hour != null && hourMap.containsKey(hour)) {
+                    item.setTaskCount(hourMap.get(hour).intValue());
+                }
+            }
+        }
+
+        return template;
+    }
+
+    private static Integer parseHourFromLabel(String label) {
+        if (label == null) return null;
+        try {
+            String s = label.replace("时", "").trim();
+            return Integer.parseInt(s);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * FLOW_STATUS 数字转中文：1已预约 2已签到 3已叫号 4已过号 5已进场 6已称重 7已装车 8二次称重 9已结算 10已还卡 11已出场 12已取消
+     */
+    private static String translateFlowStatus(String flowStatus) {
+        if (flowStatus == null) return null;
+        switch (flowStatus.trim()) {
+            case "1": return "已预约";
+            case "2": return "已签到";
+            case "3": return "已叫号";
+            case "4": return "已过号";
+            case "5": return "已进场";
+            case "6": return "已称重";
+            case "7": return "已装车";
+            case "8": return "二次称重";
+            case "9": return "已结算";
+            case "10": return "已还卡";
+            case "11": return "已出场";
+            case "12": return "已取消";
+            default: return flowStatus;
+        }
+    }
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java

@@ -85,7 +85,7 @@ public final class BiReportSnapshotMapperSupport {
                         .entryOvertimeRate(0).overtimeCount(0).platformOnTimeRate(0)
                         .avgPlatformDuration(0d).yardOnTimeRate(0).avgYardDuration(0d).build())
                 .platformOverview(PlatformOverviewVO.builder()
-                        .totalPlatforms(0).currentOccupancyRate(0).operatingPlatforms(0).todayTasks(0).build())
+                        .totalPlatforms(0).currentOccupancyRate(0d).operatingPlatforms(0).todayTasks(0).build())
                 .vehicleStatus(VehicleStatusVO.builder()
                         .todayReservedVehicles(0).notCheckedIn(0).operatingVehicles(0).completedVehicles(0).build())
                 .avgOperationDurationTrend(Collections.emptyList())

mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/repository/mapper/BiSnapshotWriteMapper.java

@@ -13,6 +13,8 @@ public interface BiSnapshotWriteMapper {
 
     int insertPlatformSurveillanceSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
 
+    int updateLatestPlatformSurveillanceSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
+
     int insertOverallOperationSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
 
     int insertWarehouseOperationZoneSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);

mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/service/BiReportSnapshotSyncService.java

@@ -13,10 +13,20 @@ import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillance
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformVehicleItemVO;
+import com.mhd.bi.domain.biPlatformRealData.service.BiPlatformRealDataService;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.Random;
 
 /**
@@ -34,6 +44,7 @@ public class BiReportSnapshotSyncService {
 
     private final BiSnapshotWriteMapper biSnapshotWriteMapper;
     private final ObjectMapper objectMapper;
+    private final BiPlatformRealDataService biPlatformRealDataService;
 
     /**
      * 依次同步各快照表；单表失败不影响其它表，只记日志。
@@ -137,9 +148,88 @@ public class BiReportSnapshotSyncService {
         return BiSnapshotWeeklyRandomDataBuilder.warehouseTransport(new Random());
     }
 
-    /** TODO 业务落地：改为查询真实数据。临时实现见 {@link BiSnapshotWeeklyRandomDataBuilder#platformSurveillance(Random)}。 */
+    /** TODO 业务落地：部分字段改为真实数据，其余仍写死。 */
     protected PlatformSurveillanceVO buildPlatformSurveillanceSnapshot() {
-        return BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(new Random());
+        // 固定种子，保证写死字段每次生成值一致（真实字段随后实时覆盖）
+        Random r = new Random(20260825L);
+        // 写死数据复用原 builder
+        PlatformSurveillanceVO template = BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(r);
+
+        // ====== 真实数据：作业车辆列表 ======
+        List<RealPlatformVehiclePO> realVehicles = biPlatformRealDataService.queryVehicles();
+        List<PlatformVehicleItemVO> vehicleVos = new ArrayList<>();
+        for (RealPlatformVehiclePO rv : realVehicles) {
+            PlatformVehicleItemVO v = new PlatformVehicleItemVO();
+            v.setAppointmentTime(rv.getAppointmentTime());
+            v.setWorkFloor(rv.getWorkFloor());
+            v.setPlateNumber(rv.getPlateNumber());
+            v.setStatus(rv.getStatus());
+            v.setPlatformId(rv.getPlatformId());
+            v.setPlatformDuration(rv.getPlatformDuration() == null ? 0 : rv.getPlatformDuration().intValue());
+            vehicleVos.add(v);
+        }
+        if (!vehicleVos.isEmpty()) {
+            template.setVehicles(vehicleVos);
+        }
+
+        // ====== 真实数据：月台实时概览 ======
+        RealPlatformOverviewPO ov = biPlatformRealDataService.queryPlatformOverview();
+        if (template.getPlatformOverview() != null) {
+            template.getPlatformOverview().setTotalPlatforms(ov.getTotalPlatforms().intValue());
+            template.getPlatformOverview().setOperatingPlatforms(ov.getOperatingPlatforms().intValue());
+            int total = ov.getTotalPlatforms().intValue();
+            int occ = ov.getOperatingPlatforms().intValue();
+            double rate = total > 0 ? Math.round(((double) occ / total) * 100.0 * 100.0) / 100.0 : 0d;
+            template.getPlatformOverview().setCurrentOccupancyRate(rate);
+        }
+        long todayTasks = biPlatformRealDataService.countTodayTasks();
+        if (template.getPlatformOverview() != null) {
+            template.getPlatformOverview().setTodayTasks((int) todayTasks);
+        }
+
+        // ====== 真实数据：作业车辆状态统计 ======
+        RealVehicleStatusPO vs = biPlatformRealDataService.queryVehicleStatusToday();
+        if (template.getVehicleStatus() != null) {
+            template.getVehicleStatus().setTodayReservedVehicles(vs.getTodayReservedVehicles().intValue());
+            template.getVehicleStatus().setNotCheckedIn(vs.getNotCheckedIn().intValue());
+            template.getVehicleStatus().setOperatingVehicles(vs.getOperatingVehicles().intValue());
+            template.getVehicleStatus().setCompletedVehicles(vs.getCompletedVehicles().intValue());
+        }
+
+        // ====== 真实数据：本月任务统计 taskTotal ======
+        long monthTasks = biPlatformRealDataService.countMonthTasks();
+        if (template.getMonthlyTaskStatistics() != null) {
+            template.getMonthlyTaskStatistics().setTaskTotal((int) monthTasks);
+        }
+
+        // ====== 真实数据：任务负荷（今日 24 小时） ======
+        List<RealTaskLoadPO> loads = biPlatformRealDataService.queryTaskLoadToday();
+        if (!loads.isEmpty() && template.getTaskLoadStatistics() != null) {
+            Map<Integer, Long> hourMap = new HashMap<>();
+            for (RealTaskLoadPO l : loads) {
+                hourMap.put(l.getHourOfDay(), l.getTaskCount());
+            }
+            for (com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskLoadItemVO item : template.getTaskLoadStatistics()) {
+                Integer hour = parseHourFromLabel(item.getTime());
+                if (hour != null) {
+                    Long n = hourMap.get(hour);
+                    if (n != null) item.setTaskCount(n.intValue());
+                }
+            }
+        }
+
+        return template;
+    }
+
+    private static Integer parseHourFromLabel(String label) {
+        if (label == null) return null;
+        // "15时" -> 15
+        try {
+            String s = label.replace("时", "").trim();
+            return Integer.parseInt(s);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     /**

mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/support/BiSnapshotWeeklyRandomDataBuilder.java

@@ -127,6 +127,8 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
         for (String[] row : Baseline.P_PLATES) {
             int dur = jitterInt(Integer.parseInt(row[3]), r);
             vehicles.add(PlatformVehicleItemVO.builder()
+                    .appointmentTime(Baseline.P_APPOINTMENT_TIME)
+                    .workFloor(Baseline.P_WORK_FLOOR)
                     .plateNumber(row[0])
                     .status(row[1])
                     .platformId(row[2])
@@ -145,7 +147,7 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
 
         PlatformOverviewVO overview = PlatformOverviewVO.builder()
                 .totalPlatforms(Math.max(1, jitterInt(Baseline.P_TOT_PL, r)))
-                .currentOccupancyRate(jitterPercentInt(Baseline.P_OCC, r))
+                .currentOccupancyRate((double) jitterPercentInt(Baseline.P_OCC, r))
                 .operatingPlatforms(Math.max(0, jitterInt(Baseline.P_OP, r)))
                 .todayTasks(Math.max(0, jitterInt(Baseline.P_TASKS, r)))
                 .build();
@@ -394,6 +396,8 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
         static final String[] W_CUST_NAMES = {"华东冷链", "华南汽配", "西南快消", "华北家电", "跨境达"};
         static final int[] W_CUST_AMT = {198, 172, 205, 189, 221};
 
+        static final String P_APPOINTMENT_TIME = "2026-08-03 09:30:00";
+        static final String P_WORK_FLOOR = "一楼";
         static final String[][] P_PLATES = {
                 {"粤A12345", "待入场", "#12", "88"},
                 {"闽D99887", "作业中", "#07", "142"},

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/BiReportApi.java

@@ -3,6 +3,10 @@ package com.mhd.bi.interfaces.facadeApi.biReport;
 import com.mhd.bi.domain.biSnapshotSync.service.BiReportSnapshotSyncService;
 import com.mhd.bi.domain.biComprehensive.service.BiComprehensiveReportService;
 import com.mhd.bi.domain.biPlatformSurveillance.service.BiPlatformSurveillanceReportService;
+import com.mhd.bi.domain.biPlatformRealData.service.BiPlatformRealDataService;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO;
 import com.mhd.bi.domain.biOverallOperation.service.BiOverallOperationReportService;
 import com.mhd.bi.domain.biHkMacaoServiceZone.service.BiHkMacaoServiceZoneReportService;
 import com.mhd.bi.domain.biTransportOperationZone.service.BiTransportOperationZoneReportService;
@@ -29,6 +33,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * BI 报表接口
  */
@@ -48,6 +54,9 @@ public class BiReportApi extends BaseController {
     @Autowired
     private BiPlatformSurveillanceReportService biPlatformSurveillanceReportService;
 
+    @Autowired
+    private BiPlatformRealDataService biPlatformRealDataService;
+
     @Autowired
     private BiOverallOperationReportService biOverallOperationReportService;
 
@@ -92,12 +101,42 @@ public class BiReportApi extends BaseController {
     }
 
     /**
-     * 月台监测指标查询（按照 del_flag=1，按 create_time 最新一条）
+     * 月台监测指标查询（实时查 YMS 库，真实字段 + 写死字段），并落库一条到 BI_PLATFORM_SURVEILLANCE_SNAPSHOT
      */
-    @ApiOperation(value = "月台监测指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条快照")
+    @ApiOperation(value = "月台监测指标查询", notes = "每次调用实时查询 YMS 库组装并写入快照表；部分字段为真实业务数据，部分为写死数据")
     @GetMapping("/platformSurveillance")
     public BiApiResult<PlatformSurveillanceVO> platformSurveillance() {
-        PlatformSurveillanceVO data = biPlatformSurveillanceReportService.loadLatestPlatformSurveillance();
+        PlatformSurveillanceVO data = biPlatformRealDataService.buildRealTimePlatformSurveillanceAndPersist();
+        return BiApiResult.ok(data);
+    }
+
+    /**
+     * 今日预约-业务类型统计（实时查 YMS 库，不落库）
+     */
+    @ApiOperation(value = "今日预约业务类型统计", notes = "按业务类型分组统计今日预约数量，实时查询 YMS 库，不落库；例：航空打板 3 条")
+    @GetMapping("/businessTypeStats")
+    public BiApiResult<List<RealBusinessTypeStatPO>> businessTypeStats() {
+        List<RealBusinessTypeStatPO> data = biPlatformRealDataService.queryTodayBusinessTypeStats();
+        return BiApiResult.ok(data);
+    }
+
+    /**
+     * 月台监控-按楼层统计月台车辆（实时查 YMS 库，不落库）
+     */
+    @ApiOperation(value = "月台车辆统计（按楼层）", notes = "按楼层统计月台数量、今日预约车辆、当前作业车辆，实时查询 YMS 库，不落库")
+    @GetMapping("/platformFloorStats")
+    public BiApiResult<List<RealPlatformFloorStatPO>> platformFloorStats() {
+        List<RealPlatformFloorStatPO> data = biPlatformRealDataService.queryPlatformFloorStats();
+        return BiApiResult.ok(data);
+    }
+
+    /**
+     * 月台管理列表（实时查 YMS qms_window_info，不落库）
+     */
+    @ApiOperation(value = "月台管理列表", notes = "实时查询 YMS 库 qms_window_info，返回月台/鹤位窗口列表（机构、月台号、月台名称、楼层、绑定屏、UUID、状态等），不落库")
+    @GetMapping("/platformInfoList")
+    public BiApiResult<List<RealPlatformInfoPO>> platformInfoList() {
+        List<RealPlatformInfoPO> data = biPlatformRealDataService.queryPlatformInfoList();
         return BiApiResult.ok(data);
     }
 //园区物流大屏接口----------------------------------------------------------------------

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/hkMacaoZone/HkMacaoServiceZoneVO.java

@@ -1,5 +1,6 @@
 package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +18,7 @@ import java.util.List;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel("BI-港澳服务专区")
 public class HkMacaoServiceZoneVO {
 

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/hkMacaoZone/HkMapPointVO.java

@@ -1,5 +1,6 @@
 package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 @ApiModel("BI-港澳服务专区-地图点位")
 public class HkMapPointVO {
 

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/hkMacaoZone/HkVehicleDetailsVO.java

@@ -1,5 +1,6 @@
 package com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,4 +39,24 @@ public class HkVehicleDetailsVO {
     @JsonProperty("update_time")
     @ApiModelProperty("更新时间")
     private String updateTime;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("运输方向")
+    private String direction;
+
+    @ApiModelProperty("货物类型")
+    private String cargo;
+
+    @ApiModelProperty("预计到达时间")
+    private String eta;
+
+    @JsonProperty("transportion_number")
+    @ApiModelProperty("运单号")
+    private String transportionNumber;
+
+    @JsonProperty("cargo_source")
+    @ApiModelProperty("货源")
+    private String cargoSource;
 }

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformOverviewVO.java

@@ -18,7 +18,7 @@ public class PlatformOverviewVO {
     private Integer totalPlatforms;
 
     @ApiModelProperty("当前占用率，单位：%")
-    private Integer currentOccupancyRate;
+    private Double currentOccupancyRate;
 
     @ApiModelProperty("当前作业中，单位：个")
     private Integer operatingPlatforms;

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformVehicleItemVO.java

@@ -14,6 +14,12 @@ import lombok.NoArgsConstructor;
 @ApiModel("月台监测-作业车辆")
 public class PlatformVehicleItemVO {
 
+    @ApiModelProperty("预约申请时间")
+    private String appointmentTime;
+
+    @ApiModelProperty("作业楼层")
+    private String workFloor;
+
     @ApiModelProperty("车牌号码")
     private String plateNumber;
 

mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mhd.bi.domain.biPlatformRealData.repository.mapper.BiPlatformRealDataMapper">
+
+    <!-- 作业车辆状态列表（vehicles）：仅查询预约日期是今天（TARGET_DATE）的车辆
+         plateNumber      <- qms_main_business.CAR_NO
+         status           <- qms_main_business.FLOW_STATUS
+         platformId       <- qms_main_business.WINDOW_NAME（叫号月台，主业务表直接有）
+         platformDuration <- qms_main_business.EXIT_TIME - ENTRY_TIME（分钟）
+         appointmentTime  <- qms_main_business.CREATE_TIME
+         workFloor        <- qms_window_info.PLATFORM_FLOOR（按 WINDOW_NAME 关联）
+    -->
+    <select id="queryVehicles" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO">
+        SELECT
+            mb.CAR_NO             AS plateNumber,
+            mb.FLOW_STATUS        AS status,
+            mb.WINDOW_NAME        AS platformId,
+            CASE
+                WHEN mb.EXIT_TIME IS NOT NULL AND mb.ENTRY_TIME IS NOT NULL
+                THEN CAST((mb.EXIT_TIME - mb.ENTRY_TIME) * 24 * 60 AS BIGINT)
+                ELSE 0
+            END                  AS platformDuration,
+            TO_CHAR(mb.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS') AS appointmentTime,
+            wi.PLATFORM_FLOOR     AS workFloor
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS mb
+        LEFT JOIN NGWL_TEST_YMS.QMS_WINDOW_INFO wi
+               ON wi.WINDOW_NAME = mb.WINDOW_NAME
+        WHERE mb.TARGET_DATE IS NOT NULL
+          AND TRUNC(mb.TARGET_DATE) = TRUNC(SYSDATE)
+        ORDER BY mb.CREATE_TIME DESC
+    </select>
+
+    <!-- 月台概览：totalPlatforms（总条数）、operatingPlatforms（作业状态=占用，JOB_STATUS: 0空闲 1占用） -->
+    <select id="queryPlatformOverview" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO">
+        SELECT
+            COUNT(1) AS totalPlatforms,
+            SUM(CASE WHEN JOB_STATUS = 1 THEN 1 ELSE 0 END) AS operatingPlatforms
+        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO
+    </select>
+
+    <!-- 今日作业任务：实际进入时间是今日的 -->
+    <select id="countTodayTasks" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE ENTRY_TIME IS NOT NULL
+          AND TRUNC(ENTRY_TIME) = TRUNC(SYSDATE)
+    </select>
+
+    <!-- 车辆状态统计：今日的统计（按创建时间 CREATE_TIME / 流程状态）
+         todayReservedVehicles 改为按预约日期 TARGET_DATE（其它 3 项保持 CREATE_TIME）
+         FLOW_STATUS: 1已预约 2已签到 3已叫号 4已过号 5已进场 6已称重 7已装车 8二次称重 9已结算 10已还卡 11已出场 12已取消 -->
+    <select id="queryVehicleStatusToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO">
+        SELECT
+            SUM(CASE WHEN TRUNC(TARGET_DATE) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS todayReservedVehicles,
+            SUM(CASE WHEN FLOW_STATUS = '1' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS notCheckedIn,
+            SUM(CASE WHEN FLOW_STATUS IN ('5','6','7','8','9','10') AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS operatingVehicles,
+            SUM(CASE WHEN FLOW_STATUS = '11' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS completedVehicles
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+    </select>
+
+    <!-- 本月任务量：实际进入时间是本月的 -->
+    <select id="countMonthTasks" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE ENTRY_TIME IS NOT NULL
+          AND TO_CHAR(ENTRY_TIME, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
+    </select>
+
+    <!-- 今日预约-业务名称统计：按 BUSINESS_NAME（业务名称）分组统计今日预约数量，按预约日期 TARGET_DATE 过滤 -->
+    <select id="queryTodayBusinessTypeStats" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO">
+        SELECT
+            BUSINESS_NAME AS businessName,
+            COUNT(1)      AS count
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE BUSINESS_NAME IS NOT NULL
+          AND TRUNC(TARGET_DATE) = TRUNC(SYSDATE)
+        GROUP BY BUSINESS_NAME
+        ORDER BY COUNT(1) DESC
+    </select>
+
+    <!-- 月台监控-按楼层统计：楼层从叫号月台 WINDOW_NAME 解析（如 S1-01 / N1-02 -> F1），不依赖字母前缀，只取 - 前面那段的数字
+         platformCount 来自 QMS_WINDOW_INFO；todayReservedVehicles/operatingVehicles 来自 QMS_MAIN_BUSINESS（按 TARGET_DATE=今天） -->
+    <select id="queryPlatformFloorStats" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO">
+        SELECT
+            'F' || SUBSTR(W.WINDOW_NAME, INSTR(W.WINDOW_NAME,'-')-1, 1) AS floorNo,
+            COUNT(DISTINCT W.WINDOW_NAME)                               AS platformCount,
+            COUNT(DISTINCT CASE
+                WHEN TRUNC(mb.TARGET_DATE) = TRUNC(SYSDATE) THEN mb.CAR_NO
+            END)                                                        AS todayReservedVehicles,
+            COUNT(DISTINCT CASE
+                WHEN TRUNC(mb.TARGET_DATE) = TRUNC(SYSDATE)
+                 AND mb.FLOW_STATUS IN ('5','6','7','8','9','10')
+                THEN mb.CAR_NO
+            END)                                                        AS operatingVehicles
+        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO W
+        LEFT JOIN NGWL_TEST_YMS.QMS_MAIN_BUSINESS mb
+               ON mb.WINDOW_NAME = W.WINDOW_NAME
+        WHERE W.WINDOW_NAME LIKE '%-%'
+        GROUP BY SUBSTR(W.WINDOW_NAME, INSTR(W.WINDOW_NAME,'-')-1, 1)
+        ORDER BY 1 DESC
+    </select>
+
+    <!-- 任务负荷（今日 24 小时时段）：按 EXTRACT(HOUR FROM ENTRY_TIME) 统计 -->
+    <select id="queryTaskLoadToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO">
+        SELECT
+            EXTRACT(HOUR FROM ENTRY_TIME) AS hourOfDay,
+            COUNT(1) AS taskCount
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE ENTRY_TIME IS NOT NULL
+          AND TRUNC(ENTRY_TIME) = TRUNC(SYSDATE)
+        GROUP BY EXTRACT(HOUR FROM ENTRY_TIME)
+        ORDER BY EXTRACT(HOUR FROM ENTRY_TIME)
+    </select>
+
+    <!-- 月台管理列表：查询 YMS qms_window_info 月台/鹤位窗口
+         机构名称 deptName  <- sys_dept.DEPT_NAME（d.dept_id = a.ORG_NO 关联）
+         鹤位屏名称 berrNames <- qms_window_berr(WINDOW_ID/BERR_ID) join qms_berr_config(ID/BERR_NAME)，WM_CONCAT 拼接
+         其余列来自 qms_window_info 本身 -->
+    <select id="queryPlatformInfoList" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO">
+        SELECT
+            a.ID              AS id,
+            a.ORG_NO          AS orgNo,
+            d.DEPT_NAME       AS deptName,
+            a.WINDOW_NUMBER   AS windowNumber,
+            a.WINDOW_NAME     AS windowName,
+            a.PRIORITY_SET    AS prioritySet,
+            a.RUNNING_STATUS  AS runningStatus,
+            a.CREATE_BY       AS createBy,
+            TO_CHAR(a.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS') AS createTime,
+            a.UUID            AS uuid,
+            a.GUIDE_IMAGES    AS guideImages,
+            a.PLATFORM_FLOOR  AS platformFloor,
+            a.JOB_STATUS      AS jobStatus,
+            (
+                SELECT WM_CONCAT(qbc.BERR_NAME)
+                FROM NGWL_TEST_YMS.QMS_WINDOW_BERR qwb
+                LEFT JOIN NGWL_TEST_YMS.QMS_BERR_CONFIG qbc ON qbc.ID = qwb.BERR_ID
+                WHERE qwb.WINDOW_ID = a.ID
+            )                 AS berrNames
+        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO a
+        LEFT JOIN NGWL_TEST_YMS.SYS_DEPT d ON d.DEPT_ID = a.ORG_NO
+        ORDER BY a.PLATFORM_FLOOR, a.WINDOW_NUMBER
+    </select>
+</mapper>

mhd-bi/src/main/resources/mapper/biSnapshotSync/BiSnapshotWriteMapper.xml

@@ -18,6 +18,15 @@
         values (#{payloadJson}, SYSDATE, SYSDATE, 1, #{remark})
     </insert>
 
+    <update id="updateLatestPlatformSurveillanceSnapshot">
+        update NGWL_TEST_BI.BI_PLATFORM_SURVEILLANCE_SNAPSHOT
+        set PAYLOAD_JSON = #{payloadJson},
+            UPDATE_TIME   = SYSDATE,
+            REMARK        = #{remark}
+        where DEL_FLAG = 1
+          and ID = (select max(t.ID) from NGWL_TEST_BI.BI_PLATFORM_SURVEILLANCE_SNAPSHOT t where t.DEL_FLAG = 1)
+    </update>
+
     <insert id="insertOverallOperationSnapshot">
         insert into NGWL_TEST_BI.BI_OVERALL_OPERATION_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG, REMARK)
         values (#{payloadJson}, SYSDATE, SYSDATE, 1, #{remark})

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/constant/ServiceNameConstants.java

@@ -66,6 +66,9 @@ public class ServiceNameConstants
     //YMS系统
     public static final String YMS_SERVICE = "mhd-yms-service";
 
+    //YMS系统
+    public static final String XXL_JOB_SERVICE = "xxl-job-service";
+
 
 
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TmsAddressMultiDTO.java

@@ -32,8 +32,8 @@ public class TmsAddressMultiDTO {
     @ApiModelProperty(value = "装卸货联系人电话")
     private String contactPhone;
     @ApiModelProperty(value = "装卸货日期（年月日）")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
     @ApiModelProperty(value = "装卸货时间（上午、下午、24小时）")
     private String layTime;

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperPo.java

@@ -271,4 +271,8 @@ public class UserShipperPo {
 
         @ApiModelProperty("货主code")
         private String roleCodeShipper;
+    @ApiModelProperty(name = "是否校验信用")
+    private String isCheckCredit;
+    @ApiModelProperty(name = "组织代码")
+    private String orgCode;
     }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/WarehousePO.java

@@ -33,4 +33,6 @@ public class WarehousePO implements Serializable {
     @Excel(name = "仓库名称")
     private String warehouseName;
 
+    @Excel(name = "是否启用: 1-否 2-是")
+    private Integer isEnable;
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/thirdparty/MdmMerchantRecordDTO.java

@@ -46,6 +46,9 @@ public class MdmMerchantRecordDTO implements Serializable {
     @ApiModelProperty("电子邮件")
     private String desc16;
 
+    @ApiModelProperty("nc编码")
+    private String desc17;
+
     @ApiModelProperty("身份证号")
     private String desc23;
 

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/thirdparty/MdmMerchantSyncFilter.java

@@ -95,21 +95,12 @@ public final class MdmMerchantSyncFilter {
 
     public static SkipReason resolveSkipReason(MdmMerchantRecordDTO record, String orgNcCode,
                                                Long syncOrganizationId, Long topOrganizationId) {
-        if (record == null || StringUtils.isEmpty(record.getCode())) {
+        if (StringUtils.isEmpty(trim(record.getDesc17()))) {
             return SkipReason.EMPTY_CODE;
         }
-        if (!isCustomer(record)) {
-            return SkipReason.NOT_CUSTOMER;
-        }
-        if (StringUtils.isNotEmpty(orgNcCode) && !orgNcCode.equals(trim(record.getCode()))) {
-            return SkipReason.ORG_MISMATCH;
-        }
         if (StringUtils.isEmpty(trim(record.getDesc1()))) {
             return SkipReason.MISSING_NAME;
         }
-        if (isDisabled(record)) {
-            return SkipReason.DISABLED;
-        }
         return null;
     }
 

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/enums/RoleEnum.java

@@ -16,7 +16,8 @@ public enum RoleEnum {
     STORE_ADMIN("店铺管理员", "store_admin"),
     OWNER_CARGO("货主", "ownerCargo"),
     SUPPLIER("供应商", "supplier"),
-    CUSTOMER("客户", "customer");
+    CUSTOMER("客户", "customer"),
+    TENANT("租户", "tenant");
 
     private String name;
     private String code;

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java

@@ -26,7 +26,7 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "mhd-third-party-service", configuration = FeignAutoConfiguration.class)
+@FeignClient(value = "mhd-third-party-service",url = "http://10.102.192.30:8012",configuration = FeignAutoConfiguration.class)
 public interface ThirdPartyServiceFeign {
 
     //查询当前组织所有三方接口信息

mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/handler/GlobalExceptionHandler.java

@@ -88,7 +88,8 @@ public class GlobalExceptionHandler
     {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生未知异常.", requestURI, e);
-        return AjaxResult.error(e.getMessage());
+        String msg = StringUtils.isEmpty(e.getMessage()) ? "系统繁忙，请稍后重试" : e.getMessage();
+        return AjaxResult.error(msg);
     }
 
     /**
@@ -99,7 +100,8 @@ public class GlobalExceptionHandler
     {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生系统异常.", requestURI, e);
-        return AjaxResult.error(e.getMessage());
+        String msg = StringUtils.isEmpty(e.getMessage()) ? "系统繁忙，请稍后重试" : e.getMessage();
+        return AjaxResult.error(msg);
     }
 
     /**

mhd-gateway/src/main/java/com/mhd/gateway/config/CaptchaConfig.java

@@ -34,6 +34,8 @@ public class CaptchaConfig
         properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode");
         // 验证码文本字符长度 默认为5
         properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
+        // 验证码文本字符源 默认为abcde2345678gfynmnpqr 改为纯数字
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING, "0123456789");
         // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
         properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
         // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy

mhd-gateway/src/main/java/com/mhd/gateway/filter/AuthFilter.java

@@ -191,6 +191,7 @@ public class AuthFilter implements GlobalFilter, Ordered
 
     /**
      * 获取请求token
+     * 优先从 Authorization 请求头获取，其次从 URL 参数 token 获取（SSO场景）
      */
     private String getToken(ServerHttpRequest request)
     {
@@ -200,6 +201,11 @@ public class AuthFilter implements GlobalFilter, Ordered
         {
             token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY);
         }
+        // 兜底：从URL参数中获取token（SSO单点登录场景，前端尚未存入localStorage时）
+        if (StringUtils.isEmpty(token))
+        {
+            token = request.getQueryParams().getFirst("token");
+        }
         return token;
     }
 

mhd-gateway/src/main/resources/bootstrap.yml

@@ -13,22 +13,15 @@ spring:
   cloud:
     nacos:
       discovery:
-#        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.31:6848
-        server-addr: 10.33.0.129:6010
-        #线上正式环境
-#        server-addr: 127.0.0.1:8848
-#        server-addr: 10.102.192.31:6848
+        server-addr: 127.0.0.1:8848
+#        server-addr: 10.102.192.30:6848
+#        server-addr: 10.33.0.129:6010
         username: nacos
         password: manhuoda@2023
       config:
-#        server-addr: 127.0.0.1:8848
-        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.33.0.129:6010
-        #线上正式环境
-#        server-addr: 127.0.0.1:8848
-#        server-addr: 10.102.192.31:6848
+        server-addr: 127.0.0.1:8848
+#        server-addr: 10.33.0.129:6010
+#        server-addr: 10.102.192.30:6848
         username: nacos
         password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java

@@ -40,6 +40,14 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import com.mhd.basic.interfaces.dto.shipperLeaseDetailsApi.WarehouseLeaseExportVO;
+import com.mhd.common.core.utils.poi.ExcelUtil;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -270,14 +278,15 @@ public class LeaseApplicationService {
      * 货主租赁明细
      * 定时任务：每天凌晨1点执行，计算前一天的货主租赁明细
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
     public void shipperLeaseDetails() {
         log.info("开始执行货主租赁明细定时任务");
         // 计算前一天的日期，将时间设置为当天的0点0分0秒，只保留日期部分
         final Date yesterday = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1));
 
         LeaseDO leaseDO = new LeaseDO();
-        leaseDO.setTime(yesterday);
+        leaseDO.setTime(yesterday); // 设置查询时间
+        leaseDO.setStatus(1); // 只查询启用状态的租赁，停用的不参与出租率计算
         //查询有效期内的租赁
         List<LeasePO> leasePOS = queryList(leaseDO);
         List<LeasePO> entireUnit = leasePOS.stream()
@@ -494,6 +503,103 @@ public class LeaseApplicationService {
         return warehouseOccupancyRatesList;
     }
 
+    /**
+     * 导出仓库出租率及客户租赁明细（单 sheet，明细行带仓库当日汇总列）
+     * 参数与 /warehouseOccupancyRate、/list 一致
+     */
+    public void exportOccupancyRate(HttpServletResponse response, ShipperLeaseDetailsDO shipperLeaseDetailsDO) throws IOException {
+        // 注意：本方法不调用 warehouseOccupancyRate()，因为该方法在不传 warehouseId 时
+        // totalArea 会算成全系统所有仓库库区面积之和（如 6168），导致导出面积/日租率错误。
+        // 这里自行按 (业务日期 + 仓库) 维度计算，保证多仓库导出时每个仓库的面积/日租率正确。
+
+        // ===== 1. 查全部明细（用副本 DO，避免影响外部）=====
+        ShipperLeaseDetailsDO detailDO = new ShipperLeaseDetailsDO();
+        BeanUtils.copyProperties(shipperLeaseDetailsDO, detailDO);
+        List<ShipperLeaseDetailsPO> detailList = shipperLeaseDetailsService.queryList(detailDO);
+        if (detailList == null) {
+            detailList = new ArrayList<>();
+        }
+
+        // ===== 2. 预算每个仓库的总面积（启用库区的 storageRegion 累加），建 warehouseId -> totalArea 映射 =====
+        Set<Long> warehouseIds = detailList.stream()
+                .map(ShipperLeaseDetailsPO::getWarehouseId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        Map<Long, BigDecimal> warehouseTotalAreaMap = new HashMap<>();
+        for (Long wid : warehouseIds) {
+            StorageSectionDO storageSectionDO = new StorageSectionDO();
+            storageSectionDO.setWarehouseId(wid);
+            storageSectionDO.setOpeningUp(1);
+            List<StorageSectionPO> sections = storageSectionApplicationService.queryList(storageSectionDO);
+            BigDecimal area = BigDecimal.ZERO;
+            for (StorageSectionPO s : sections) {
+                area = area.add(s.getStorageRegion() == null ? BigDecimal.ZERO : s.getStorageRegion());
+            }
+            warehouseTotalAreaMap.put(wid, area);
+        }
+
+        // ===== 3. 按 (业务日期 + 仓库ID) 聚合，算每个仓库当天的整租/散租面积 =====
+        // summaryMap: key -> [整租面积, 散租面积]
+        SimpleDateFormat keySdf = new SimpleDateFormat("yyyy-MM-dd");
+        Map<String, BigDecimal[]> summaryMap = new HashMap<>();
+        for (ShipperLeaseDetailsPO d : detailList) {
+            String key = (d.getBusinessDate() == null ? "" : keySdf.format(d.getBusinessDate()))
+                    + "_" + d.getWarehouseId();
+            BigDecimal[] arr = summaryMap.computeIfAbsent(key, k -> new BigDecimal[]{BigDecimal.ZERO, BigDecimal.ZERO});
+            BigDecimal leaseArea = d.getLeaseArea() == null ? BigDecimal.ZERO : d.getLeaseArea();
+            if ("整租".equals(d.getLeaseType())) {
+                arr[0] = arr[0].add(leaseArea);
+            } else {
+                arr[1] = arr[1].add(leaseArea);
+            }
+        }
+
+        // ===== 4. 明细为主，每行拼上对应仓库当天的汇总（总面积/日租率按仓库单独算）=====
+        List<WarehouseLeaseExportVO> exportList = new ArrayList<>();
+        for (ShipperLeaseDetailsPO d : detailList) {
+            WarehouseLeaseExportVO vo = new WarehouseLeaseExportVO();
+            // 明细列
+            vo.setBusinessDate(d.getBusinessDate());
+            vo.setOrganizationName(d.getOrganizationName());
+            vo.setWarehouseName(d.getWarehouseName());
+            vo.setCargoOwnerName(d.getCargoOwnerName());
+            vo.setLeaseType(d.getLeaseType());
+            vo.setLeaseArea(d.getLeaseArea());
+            // 汇总列
+            String key = (d.getBusinessDate() == null ? "" : keySdf.format(d.getBusinessDate()))
+                    + "_" + d.getWarehouseId();
+            BigDecimal[] arr = summaryMap.get(key);
+            BigDecimal entireLeaseArea = (arr != null) ? arr[0] : BigDecimal.ZERO;
+            BigDecimal fractionalLeaseArea = (arr != null) ? arr[1] : BigDecimal.ZERO;
+            vo.setEntireLeaseArea(entireLeaseArea);
+            vo.setFractionalLeaseArea(fractionalLeaseArea);
+            // 该仓库的总面积（按仓库单独算，不再用全局总和）
+            BigDecimal widTotalArea = warehouseTotalAreaMap.getOrDefault(d.getWarehouseId(), BigDecimal.ZERO);
+            vo.setTotalArea(widTotalArea);
+            // 日租率 = (整租+散租) / 总面积 × 100，保留2位小数（直接输出百分比值，如 10.00）
+            BigDecimal leaseSum = entireLeaseArea.add(fractionalLeaseArea);
+            BigDecimal dailyRate = widTotalArea.compareTo(BigDecimal.ZERO) == 0
+                    ? BigDecimal.ZERO
+                    : leaseSum.multiply(new BigDecimal("100")).divide(widTotalArea, 2, BigDecimal.ROUND_HALF_UP);
+            vo.setDailyRentalRate(dailyRate);
+            exportList.add(vo);
+        }
+
+        // ===== 5. 按业务日期降序、仓库名升序排序（null 排最后）=====
+        exportList.sort(Comparator
+                .comparing(WarehouseLeaseExportVO::getBusinessDate, Comparator.nullsLast(Comparator.reverseOrder()))
+                .thenComparing(WarehouseLeaseExportVO::getWarehouseName, Comparator.nullsLast(Comparator.naturalOrder())));
+
+        // ===== 6. 用 ExcelUtil 导出（项目通用做法，单 sheet）=====
+        String fileName = URLEncoder.encode("仓库出租率导出", "UTF-8").replaceAll("\\+", "%20");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+
+        ExcelUtil<WarehouseLeaseExportVO> util = new ExcelUtil<>(WarehouseLeaseExportVO.class);
+        util.exportExcel(response, exportList, "仓库出租率");
+    }
+
 
     /**
      * 定时任务整租推送到bms
@@ -537,7 +643,7 @@ public class LeaseApplicationService {
     /**
      * 定时任务散租推送到bms
      */
-    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")
     public void ScatteredRentalSynchronization() {
         LeaseDO leaseDO = new LeaseDO();
         leaseDO.setTime(new Date());
@@ -581,6 +687,25 @@ public class LeaseApplicationService {
         }
     }
 
+    /**
+     * 启用/停用租赁
+     * @param leaseIds 租赁ID列表
+     * @param status 目标状态：1=启用，0=停用
+     */
+    public Boolean updateStatus(List<Long> leaseIds, Integer status) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long updateBy = loginUser != null ? loginUser.getUserid() : null;
+        String updateByName = loginUser != null ? loginUser.getUsername() : null;
+        if (leaseIds == null || leaseIds.isEmpty()) {
+            throw new ServiceException("租赁ID不能为空");
+        }
+        if (status == null || (status != 0 && status != 1)) {
+            throw new ServiceException("状态值无效：1=启用，0=停用");
+        }
+        log.info("启用/停用租赁--结束,leaseIds={},状态={},更新人id={}，更新人名称={}",leaseIds,status==0?"停用":"启用",updateBy,updateByName);
+        return leaseDomainService.updateStatus(leaseIds, status, updateBy, updateByName);
+    }
+
 //    /**
 //     * @description 设置数据字典键值
 //     * @author ZhouGY

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/MessageManageApplicationService.java

@@ -461,7 +461,8 @@ public class MessageManageApplicationService
         //获取当前登录人
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if(null == loginUser){
-            throw new ServiceException("获取登录人失败");
+            //未登录(游客)：返回空消息中心结构，保证小程序界面正常展示而不报错
+            return buildEmptyAppNoticeList();
         }
         noticeMessageLoggingDo.setUserId(loginUser.getUserid());
         //获取每种类型的最新一条
@@ -522,6 +523,27 @@ public class MessageManageApplicationService
         return result;
     }
 
+    /**
+     * 未登录(游客)时返回空的消息中心结构，避免前端页面因无登录上下文而报错
+     * @return NoticeMessageLoggingAppListPo
+     */
+    private NoticeMessageLoggingAppListPo buildEmptyAppNoticeList() {
+        NoticeMessageLoggingAppListPo result = new NoticeMessageLoggingAppListPo();
+        NoticeMessageLoggingAppListPo.CommonNotice serviceNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        serviceNotice.setUnreadNum("0");
+        NoticeMessageLoggingAppListPo.CommonNotice activityNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        activityNotice.setUnreadNum("0");
+        NoticeMessageLoggingAppListPo.CommonNotice logisticsNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        logisticsNotice.setUnreadNum("0");
+        NoticeMessageLoggingAppListPo.CommonNotice systemNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
+        systemNotice.setUnreadNum("0");
+        result.setServiceNotice(serviceNotice);
+        result.setActivityNotice(activityNotice);
+        result.setLogisticsNotice(logisticsNotice);
+        result.setSystemNotice(systemNotice);
+        return result;
+    }
+
     /**
      * APP根据类型获取消息通知
      * @param noticeMessageLoggingDo

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java

@@ -268,12 +268,25 @@ public class ContractManageApplicationService {
         Long organizationId = contractManageDTO.getOrganizationId();
         String sunjectCode = contractManageDTO.getSubjectCode();
         Long topOrganizationId = contractManageDTO.getTopOrganizationId();
-        List<ContractManage> UserContractManages = contractManageMapper.selectList(new LambdaQueryWrapper<ContractManage>()
-                .eq(ContractManage::getSettlementCustomersId, settlementCustomersId)
-                .eq(ContractManage::getDelFlag, 1)
-                .eq(ContractManage::getOrganizationId, organizationId)
-                .eq(ContractManage::getTopOrganizationId, topOrganizationId)
-                .eq(ContractManage::getCommonContractFlag, 2));
+        ContractManageDO contractManageDO = new ContractManageDO();
+        contractManageDO.setOrganizationId(organizationId);
+        contractManageDO.setSettlementCustomersId(settlementCustomersId);
+        contractManageDO.setTopOrganizationId(topOrganizationId);
+        contractManageDO.setCommonContractFlag(2);
+        contractManageDO.setDelFlag(1);
+        contractManageDO.setFirstSubjectCode(sunjectCode);
+        List<ContractManagePO> contractManagePOS = contractManageMapper.queryList(contractManageDO);
+        if (contractManagePOS != null && contractManagePOS.size() > 1) {
+            throw new RuntimeException("同一费用科目存在多条合同,请检查");
+        }
+        List<ContractManage> UserContractManages = new ArrayList<>();
+        if (contractManagePOS != null) {
+            for (ContractManagePO po : contractManagePOS) {
+                ContractManage contractManage = new ContractManage();
+                BeanUtils.copyProperties(po, contractManage);
+                UserContractManages.add(contractManage);
+            }
+        }
         if (UserContractManages != null && UserContractManages.size() > 0) {
             //用户合同计费策略
             calucateSubjectAndPriceStrategy(UserContractManages, organizationId, topOrganizationId, sunjectCode, result);
@@ -595,7 +608,8 @@ public class ContractManageApplicationService {
             通用合同：同一时间段、同一合同类型，只能存在一个
             特殊合同：同一结算主体、同一时间段、同一合同类型，只能存在一个
          */
-        checkContract(contractManageDO);
+        //20260702取消同一时间段不能有相同合同校验
+        //checkContract(contractManageDO);
         handleData(contractManageDO);
         handleDict(contractManageDO);
         contractManageDO.setContractNumber(OrderSequence.getOrderCode("HT"));
@@ -603,7 +617,7 @@ public class ContractManageApplicationService {
         contractManageDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
         contractManageDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         boolean flag = contractManageDomainService.insert(contractManageDO);
-        handleDetils(contractManageDO);
+        handleDetils(contractManageDO, true);
         return flag;
     }
 
@@ -737,7 +751,7 @@ public class ContractManageApplicationService {
     /**
      * 处理合同详情
      */
-    private void handleDetils(ContractManageDO contractManageDO) {
+    private void handleDetils(ContractManageDO contractManageDO, boolean isInsert) {
         //获取当前登录人信息
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (ObjectUtil.isNull(loginUser)) {
@@ -745,6 +759,10 @@ public class ContractManageApplicationService {
         }
         //根据合同编码查询保存合同信息
         ContractManagePO contractManagePO = contractManageDomainService.getInfoByCode1(contractManageDO.getOriginalContractNumber());
+        //修改时，不管前端是否传明细，都需要先删除该合同原有的明细，避免明细为空时老明细仍在
+        if (!isInsert) {
+            contractManageDetailMapper.delete(new LambdaQueryWrapper<ContractManageDetail>().eq(ContractManageDetail::getContractManageId, contractManageDO.getContractManageId()));
+        }
         //保存合同详情科目
         List<ContractManageDetailDTO> contractManageDetailDTOList = contractManageDO.getContractManageDetailDTOList();
         if(null != contractManageDetailDTOList && contractManageDetailDTOList.size()>0){
@@ -813,10 +831,13 @@ public class ContractManageApplicationService {
                     }
                 }
 
-                if(null != contractManagePO){
-                    contractManageDetailDO.setContractManageId(contractManagePO.getContractManageId());
+                if (isInsert) {
+                    // 新增/复制时使用新插入的合同ID
+                    contractManageDetailDO.setContractManageId(contractManageDO.getContractManageId());
+                } else {
+                    // 修改时使用当前正在修改的合同ID，不能用 getInfoByCode1 查到的（避免多条合同 originalContractNumber 相同导致明细错绑）
+                    contractManageDetailDO.setContractManageId(contractManageDO.getContractManageId());
                 }
-                //contractManageDetailDO.setContractManageId(contractManageDO.getContractManageId());
                 contractManageDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
                 contractManageDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
                 contractManageDetailDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
@@ -831,9 +852,9 @@ public class ContractManageApplicationService {
     @Transactional
     public Boolean update(ContractManageDO contractManageDO) {
         validateContractType(contractManageDO.getContractType());
-        checkContract(contractManageDO);
+        //checkContract(contractManageDO);
         handleData(contractManageDO);
-        handleDetils(contractManageDO);
+        handleDetils(contractManageDO, false);
         handleDict(contractManageDO);
         return contractManageDomainService.update(contractManageDO);
     }
@@ -935,6 +956,79 @@ public class ContractManageApplicationService {
         return resultContract;
     }
 
+    public ContractManagePO getInfoByCustomerAndSecondSubjectCode(String settlementCustomersCode,Integer contractType, Long topOrganizationId, Long organizationId,String firstSubjectCode) {
+        /*
+            首先根据合同类型（仓储、运输、其他），以及结算客户，查询合同信息
+            如果传了结算主体，则根据结算主体以及当前时间查询有效的特殊合同，如果特殊合同没有，则查询通用合同
+         */
+        //获取当前登录人信息
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser) && topOrganizationId == null) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        if(contractType==null){
+            throw new ServiceException("合同类型不能为空");
+        }
+        ContractManagePO resultContract = new ContractManagePO();
+        //查询当前日期在有效期内的合同
+        ContractManageDO queryParam = new ContractManageDO();
+        queryParam.setNowDateString(DateUtil.format(new Date(),"yyyy-MM-dd"));
+        queryParam.setFirstSubjectCode(firstSubjectCode);
+        queryParam.setOrganizationId(organizationId);
+        queryParam.setTopOrganizationId(topOrganizationId);
+        List<ContractManagePO> contractManagePOList = contractManageDomainService.queryList(queryParam);
+        List<ContractManagePO> contractManagePOs = contractManagePOList.stream()
+                .filter(item -> item.getSettlementCustomersCode().equals(settlementCustomersCode)
+                        && Objects.equals(item.getContractType(), contractType))
+                .collect(Collectors.toList());
+        if (contractManagePOs != null && contractManagePOs.size() > 1) {
+            resultContract.setIsMany("1");
+            return resultContract;
+        }
+        if(contractManagePOList != null && contractManagePOList.size()>0){
+            if(StringUtils.isNotEmpty(settlementCustomersCode)){
+                //根据结算对象,及合同的类型 查询对应合同信息
+                ContractManagePO contractManagePO = contractManagePOList.stream()
+                        .filter(item -> item.getSettlementCustomersCode().equals(settlementCustomersCode) && Objects.equals(item.getContractType(), contractType)).findFirst().orElse(null);
+                if(null == contractManagePO){
+                    resultContract = findGeneralContract(contractManagePOList, contractType);
+                }else {
+                    resultContract = contractManagePO;
+                }
+            }else {
+                resultContract = findGeneralContract(contractManagePOList, contractType);
+            }
+            if(null == resultContract){
+                throw new ServiceException("找不到匹配的合同，请重试");
+            }
+            //得到合同后，查询合同明细
+            List<ContractManageDetailPO> contractManageDetailPOList = contractManageDetailDomainService.queryListByManageId(resultContract.getContractManageId());
+            List<ContractManageDetailPO> contractManageDetailSaveList = new ArrayList<>();
+            if(contractManageDetailPOList != null && contractManageDetailPOList.size()>0){
+                //将临时合同中没有，但是通用合同中有的数据过滤出（使用 ObjectUtil.equal 避免 firstSubjectCode/secondSubjectCode 为 null 时 NPE）
+                contractManageDetailSaveList = contractManageDetailPOList.stream().filter(item -> contractManageDetailPOList.stream().noneMatch(item1 -> ObjectUtil.equal(item1.getFirstSubjectCode(), item.getFirstSubjectCode()) && ObjectUtil.equal(item1.getSecondSubjectCode(), item.getSecondSubjectCode()) && item1.getSubjectType()==1)).collect(Collectors.toList());
+                //首先根据结算科目类型将临时合同过滤出
+                List<ContractManageDetailPO> tempContractManageDetailPOList = contractManageDetailPOList.stream().filter(item -> item.getSubjectType()==2).collect(Collectors.toList());
+                //遍历两个集合，将相同费用科目code的数据，进行比较，如果结算科目类型是临时且合同有效期有效，则使用该条数据，将另一条移除
+                for (ContractManageDetailPO manageDetailPO : tempContractManageDetailPOList) {
+                    for (ContractManageDetailPO contractManageDetailPO : contractManageDetailPOList) {
+                        if(ObjectUtil.equal(contractManageDetailPO.getFirstSubjectCode(), manageDetailPO.getFirstSubjectCode()) && ObjectUtil.equal(contractManageDetailPO.getSecondSubjectCode(), manageDetailPO.getSecondSubjectCode())){
+                            //判断如果是临时合同在有效期内,则将该条数据保存到集合contractManageDetailSaveList
+                            DateTime start = DateUtil.parseDate(DateUtil.format(manageDetailPO.getSubjectEffectiveDate(),"yyyy-MM-dd"));
+                            DateTime end = DateUtil.parseDateTime(DateUtil.format(manageDetailPO.getSubjectEffectiveDate(),"yyyy-MM-dd"));
+                            DateTime now = DateUtil.beginOfDay(DateUtil.date());
+                            if (now.isAfterOrEquals(start) && now.isBefore(end)) {
+                                contractManageDetailSaveList.add(manageDetailPO);
+                            }
+                        }
+                    }
+                }
+            }
+            resultContract.setContractManageDetailPOList(contractManageDetailSaveList);
+        }
+        return resultContract;
+    }
+
     /**
      * 根据结算主体获取合同信息
      * @param settlementCustomersCode 结算主体code
@@ -1030,4 +1124,51 @@ public class ContractManageApplicationService {
     public ContractManagePO getGeneralContract() {
         return contractManageDomainService.getGeneralContract();
     }
+
+    /**
+     * 合同导出（合同头字段 + 明细拍平成一行一条明细）
+     */
+    public List<ContractManageExportVO> buildExportList(ContractManageDO contractManageDO) {
+        List<ContractManagePO> contractList = this.queryList(contractManageDO);
+        List<ContractManageExportVO> exportList = new ArrayList<>();
+        if (contractList == null || contractList.isEmpty()) {
+            return exportList;
+        }
+        List<Long> contractManageIds = contractList.stream()
+                .map(ContractManagePO::getContractManageId)
+                .collect(Collectors.toList());
+        Map<Long, List<ContractManageDetailPO>> detailMap = contractManageDetailDomainService
+                .queryListByManageIds(contractManageIds).stream()
+                .collect(Collectors.groupingBy(ContractManageDetailPO::getContractManageId));
+
+        for (ContractManagePO contract : contractList) {
+            List<ContractManageDetailPO> details = detailMap.get(contract.getContractManageId());
+            if (details != null && !details.isEmpty()) {
+                for (ContractManageDetailPO detail : details) {
+                    ContractManageExportVO vo = new ContractManageExportVO();
+                    // 合同头字段整体复制
+                    BeanUtils.copyProperties(contract, vo);
+                    // 明细字段显式赋值（合同头/明细存在同名字段，避免互相覆盖）
+                    vo.setSubjectType(detail.getSubjectType());
+                    vo.setFirstSubjectCode(detail.getFirstSubjectCode());
+                    vo.setFirstSubjectName(detail.getFirstSubjectName());
+                    vo.setSecondSubjectCode(detail.getSecondSubjectCode());
+                    vo.setSecondSubjectName(detail.getSecondSubjectName());
+                    vo.setAccountingStrategy(detail.getAccountingStrategy());
+                    vo.setBillingAttributes(detail.getBillingAttributes());
+                    vo.setSubjectEffectiveDate(detail.getSubjectEffectiveDate());
+                    vo.setSubjectExpirationDate(detail.getSubjectExpirationDate());
+                    vo.setDocumentType(detail.getDocumentType());
+                    vo.setServiceItemsName(detail.getServiceItemsName());
+                    exportList.add(vo);
+                }
+            } else {
+                // 无明细的合同也保留一行头字段
+                ContractManageExportVO vo = new ContractManageExportVO();
+                BeanUtils.copyProperties(contract, vo);
+                exportList.add(vo);
+            }
+        }
+        return exportList;
+    }
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java

@@ -13,6 +13,7 @@ import com.mhd.basic.application.service.contractManage.ContractManageApplicatio
 import com.mhd.basic.domain.expenseAccount.service.ExpenseAccountDomainService;
 import com.mhd.basic.infrastructure.feign.vo.SysDictDataVo;
 import com.mhd.basic.interfaces.dto.expenseAccount.ExpenseAccountDTO;
+import com.mhd.basic.interfaces.dto.expenseAccount.ExpenseAccountExportVO;
 import com.mhd.basic.interfaces.dto.expenseAccount.SearchExpenseAccountDTO;
 import com.mhd.common.core.enums.DictCode;
 import com.mhd.common.core.exception.ServiceException;
@@ -27,14 +28,11 @@ import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.common.core.domain.po.UserPo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -382,6 +380,55 @@ public class ExpenseAccountApplicationService {
         return expenseAccountDomainService.getInfo(expenseAccountId);
     }
 
+    /**
+     * 复制费用科目-获取原科目数据供前端回显
+     * <p>前端拿到数据后回显到新增弹窗，用户填写新科目编码后通过 /edit 接口（id 为空走新增）提交保存。
+     * 清空科目编码是为了避免直接复制出重复编码（费用科目编码无唯一性校验）。</p>
+     */
+    public ExpenseAccountPO copy(ExpenseAccountDTO expenseAccountDTO) {
+        if (expenseAccountDTO == null || expenseAccountDTO.getExpenseAccountId() == null) {
+            throw new ServiceException("原费用科目id不能为空");
+        }
+        // 获取原费用科目信息
+        ExpenseAccountPO original = expenseAccountDomainService.getInfo(expenseAccountDTO.getExpenseAccountId());
+        if (null == original) {
+            throw new ServiceException("原费用科目信息未找到");
+        }
+        // 清空主键，前端提交时走新增
+        original.setExpenseAccountId(null);
+        // 清空科目编码，强制用户输入新编码，避免编码重复
+        original.setSubjectCode(null);
+        // 清空审计字段，新增时由 ExpenseAccountAssembler 重新生成
+        original.setCreateBy(null);
+        original.setCreateByName(null);
+        original.setCreateTime(null);
+        original.setUpdateBy(null);
+        original.setUpdateByName(null);
+        original.setUpdateTime(null);
+        original.setDelFlag(null);
+        // 清空非表字段
+        original.setUnit(null);
+        original.setExpenseAccountPOList(null);
+        return original;
+    }
+
+    /**
+     * 构建费用科目导出数据（不分页全量，按列表页查询条件 + 数据权限过滤）
+     */
+    public List<ExpenseAccountExportVO> buildExportList(ExpenseAccountDO expenseAccountDO) {
+        List<ExpenseAccountExportVO> exportList = new ArrayList<>();
+        List<ExpenseAccountPO> list = this.queryList(expenseAccountDO);
+        if (list == null || list.isEmpty()) {
+            return exportList;
+        }
+        for (ExpenseAccountPO po : list) {
+            ExpenseAccountExportVO vo = new ExpenseAccountExportVO();
+            BeanUtils.copyProperties(po, vo);
+            exportList.add(vo);
+        }
+        return exportList;
+    }
+
     /**
      * 修改状态
      * @param expenseAccountDTO
@@ -580,6 +627,46 @@ public class ExpenseAccountApplicationService {
         return expenseAccountDomainService.getInfoByCode2(subjectCode,topOrganizationId);
     }
 
+    /**
+     * 根据编码和组织ID查询
+     */
+    public ExpenseAccountPO getInfoByOrgAndCode(String subjectCode, Long organizationId) {
+        if(!StringUtils.isNotEmpty(subjectCode)){
+            throw new ServiceException("费用科目编码不能为空");
+        }
+        if(organizationId == null){
+            throw new ServiceException("组织ID不能为空");
+        }
+        ExpenseAccountPO expenseAccountPO = expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId);
+//        // 组装计费单位列表：单位-单位英文
+//        List<String> unit = new ArrayList<>();
+//        if (expenseAccountPO != null) {
+//            unit.add(expenseAccountPO.getBillingUnit() + "-" + expenseAccountPO.getBillingUnitEn());
+//            unit.add(expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2());
+//            expenseAccountPO.setUnit(unit);
+//        }
+        // 组装计费单位列表(数组)，中文和英文都为null时过滤掉，避免出现"null-null"
+        List<Map<String, String>> unit = new ArrayList<>();
+        if (expenseAccountPO != null) {
+            addUnitIfPresent(unit, expenseAccountPO.getBillingUnit(), expenseAccountPO.getBillingUnitEn());
+            addUnitIfPresent(unit, expenseAccountPO.getBillingUnit2(), expenseAccountPO.getBillingUnitEn2());
+            expenseAccountPO.setUnit(unit);
+        }
+        return expenseAccountPO;
+    }
+
+    /**
+     * 组装计费单位，中文和英文都为null时不加入列表
+     */
+    private void addUnitIfPresent(List<Map<String, String>> unit, String billingUnit, String billingUnitEn) {
+        if (billingUnit == null && billingUnitEn == null) {
+            return;
+        }
+        Map<String, String> unitMap = new HashMap<>();
+        unitMap.put("unit", billingUnit + "-" + billingUnitEn);
+        unit.add(unitMap);
+    }
+
     public List<QueryExpenseAccountPO> selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){
         setDataPermissionForSearch(searchExpenseAccountDO);
         return expenseAccountDomainService.selectExpenseAccount(searchExpenseAccountDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java

@@ -157,15 +157,18 @@ public class MaterialBaseInfoApplicationService {
      * @param materialBaseInfoDO
      */
     private void shipperParam(MaterialBaseInfoDO materialBaseInfoDO){
-        AjaxResult ajaxResult = userServiceFeign.getInfo(materialBaseInfoDO.getShipperId());
-        if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
-            throw new ServiceException("获取货主信息失败");
-        }
-        UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
-        // 如果原始shipperName不为空，保留原始值（导入或手动输入时应该保留完整名称）
-        // 只有在原始shipperName为空时，才使用查询到的userName
-        if (materialBaseInfoDO.getShipperName() == null || materialBaseInfoDO.getShipperName().trim().isEmpty()) {
-            materialBaseInfoDO.setShipperName(userPo.getUserName());
+        Long shipperId = materialBaseInfoDO.getShipperId();
+        if (shipperId != null && shipperId != 0l) {
+            AjaxResult ajaxResult = userServiceFeign.getInfo(materialBaseInfoDO.getShipperId());
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取货主信息失败");
+            }
+            UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            // 如果原始shipperName不为空，保留原始值（导入或手动输入时应该保留完整名称）
+            // 只有在原始shipperName为空时，才使用查询到的userName
+            if (materialBaseInfoDO.getShipperName() == null || materialBaseInfoDO.getShipperName().trim().isEmpty()) {
+                materialBaseInfoDO.setShipperName(userPo.getUserName());
+            }
         }
     }
 

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageLocation/StorageLocationApplicationService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.mhd.basic.domain.storageLocation.repository.po.StorageLocationPO;
 import com.mhd.basic.domain.storageLocation.repository.todo.StorageLocationDO;
 import com.mhd.basic.domain.storageLocation.service.StorageLocationDomainService;
+import com.mhd.basic.interfaces.dto.storageLocation.StorageLocationDTO;
 import com.mhd.basic.domain.storageSection.repository.todo.StorageSectionDO;
 import com.mhd.basic.infrastructure.feign.vo.SysDictDataVo;
 import com.mhd.common.core.domain.po.UserPo;
@@ -207,6 +208,39 @@ public class StorageLocationApplicationService {
         return storageLocationDomainService.getInfo(storageLocationId);
     }
 
+    /**
+     * 复制库位-获取原库位数据供前端回显
+     * 前端拿到数据后跳转到新增库位页面，用户修改编码后通过edit接口提交新增
+     */
+    public StorageLocationPO copyStorageLocation(StorageLocationDTO storageLocationDTO) {
+        if (storageLocationDTO.getStorageLocationId() == null) {
+            throw new ServiceException("原库位id不能为空");
+        }
+        // 获取原库位信息
+        StorageLocationPO originalStorageLocation = storageLocationDomainService.getInfo(storageLocationDTO.getStorageLocationId());
+        if (null == originalStorageLocation) {
+            throw new ServiceException("原库位信息未找到");
+        }
+        // 清空唯一性字段：库位id不清空会导致提交后走修改分支覆盖原库位；
+        // 库位编码同组织同仓库唯一，须由用户重新填写；条码为物理唯一标识，一并清空
+        originalStorageLocation.setStorageLocationId(null);
+        originalStorageLocation.setStorageLocationCode(null);
+        originalStorageLocation.setLocationBarCode(null);
+        // 状态重置为初始值：新库位无库存(空)、启用、未作废
+        originalStorageLocation.setStatus(1);
+        originalStorageLocation.setOpeningUp(1);
+        originalStorageLocation.setNullify(1);
+        // 清空审计字段，提交新增时由Assembler按当前登录人重新生成
+        originalStorageLocation.setCreateBy(null);
+        originalStorageLocation.setCreateByName(null);
+        originalStorageLocation.setCreateTime(null);
+        originalStorageLocation.setUpdateBy(null);
+        originalStorageLocation.setUpdateByName(null);
+        originalStorageLocation.setUpdateTime(null);
+        // 其余业务字段(仓库/库区/库位组、分类/种类/混放策略、限制、长宽高、坐标、备注)保留回显
+        return originalStorageLocation;
+    }
+
     public int getStorageLocationCount(StorageLocationDO storageLocationDO)
     {
         return storageLocationDomainService.getStorageLocationCount(storageLocationDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageSection/StorageSectionApplicationService.java

@@ -21,6 +21,7 @@ import com.mhd.system.service.ISysDictTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
 import java.util.List;
 /**
  * 库区ApplicationService
@@ -42,6 +43,27 @@ public class StorageSectionApplicationService {
      */
 
     public List<StorageSectionPO> queryList(StorageSectionDO storageSectionDO) {
+        //设置查询数据权限
+        applyQueryDataPermission(storageSectionDO);
+        return storageSectionDomainService.queryList(storageSectionDO);
+    }
+
+    /**
+     * 库区面积合计：与 /list 相同的数据权限和筛选条件，SQL 直接 SUM(库区面积)，
+     * 保证合计数与列表中各行库区面积之和一致
+     */
+    public BigDecimal sumStorageRegion(StorageSectionDO storageSectionDO) {
+        //与 /list 共用同一数据权限，保证合计与列表口径一致
+        applyQueryDataPermission(storageSectionDO);
+        return storageSectionDomainService.sumStorageRegion(storageSectionDO);
+    }
+
+    /**
+     * @description 设置查询数据权限（queryList 与 sumStorageRegion 共用）
+     * @author ZhouGY
+     * @param storageSectionDO
+     */
+    private void applyQueryDataPermission(StorageSectionDO storageSectionDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (loginUser != null && loginUser.getUserPo() != null) {
             Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
@@ -91,7 +113,6 @@ public class StorageSectionApplicationService {
                 }
             }
         }
-        return storageSectionDomainService.queryList(storageSectionDO);
     }
 
 

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import com.mhd.common.core.utils.StringUtils;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -98,6 +99,13 @@ public class WarehouseApplicationService {
                 }
             }
         }
+        String orgIds = warehouseDO.getOrgIds();
+        if (StringUtils.isNotEmpty(orgIds)) {
+            String[] orgIdArray = orgIds.split(",");
+            List<Long> orgIdList = Arrays.stream(orgIdArray).map(Long::valueOf).collect(Collectors.toList());
+            warehouseDO.setOrgIdList(orgIdList);
+            warehouseDO.setOrganizationId(null);
+        }
         return warehouseDomainService.queryList(warehouseDO);
     }
 

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java

@@ -126,6 +126,18 @@ public class ContractManage extends BaseVOEntity{
     @Excel(name = "其他附件地址")
     private String otherAttachmentsUrl;
 
+    @ApiModelProperty("合同正本附件原始文件名")
+    private String contractOriginalName;
+
+    @ApiModelProperty("廉政协议附件原始文件名")
+    private String integrityAgreementName;
+
+    @ApiModelProperty("安全协议附件原始文件名")
+    private String securityProtocolName;
+
+    @ApiModelProperty("其他附件原始文件名(多文件时与 otherAttachmentsUrl 同分隔符、同顺序)")
+    private String otherAttachmentsName;
+
     @ApiModelProperty("我司签订人")
     @Excel(name = "我司签订人")
     private String ourSinged;

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/facade/IContractManageService.java

@@ -23,7 +23,7 @@ public interface IContractManageService extends IService<ContractManage>
     /**
      * 新增合同管理
      */
-    public Boolean insert(ContractManageDO contractManageDO);
+    public Long insert(ContractManageDO contractManageDO);
 
     /**
      * 修改合同管理

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/persistence/ContractManageImpl.java

@@ -37,10 +37,11 @@ public class ContractManageImpl extends ServiceImpl<ContractManageMapper, Contra
      * 新增合同管理
      */
     @Override
-    public Boolean insert(ContractManageDO contractManageDO) {
+    public Long insert(ContractManageDO contractManageDO) {
         ContractManage contractManage = new ContractManage();
         BeanUtils.copyProperties(contractManageDO,contractManage);
-        return this.save(contractManage);
+        this.save(contractManage);
+        return contractManage.getContractManageId();
     }
 
     /**

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java

@@ -124,6 +124,18 @@ public class ContractManagePO extends BaseVOEntity{
     @Excel(name = "其他附件地址")
     private String otherAttachmentsUrl;
 
+    @ApiModelProperty("合同正本附件原始文件名")
+    private String contractOriginalName;
+
+    @ApiModelProperty("廉政协议附件原始文件名")
+    private String integrityAgreementName;
+
+    @ApiModelProperty("安全协议附件原始文件名")
+    private String securityProtocolName;
+
+    @ApiModelProperty("其他附件原始文件名(多文件时与 otherAttachmentsUrl 同分隔符、同顺序)")
+    private String otherAttachmentsName;
+
     @ApiModelProperty("我司签订人")
     @Excel(name = "我司签订人")
     private String ourSinged;
@@ -183,5 +195,5 @@ public class ContractManagePO extends BaseVOEntity{
 
     @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
     private Integer transportationCosts;
-
+    private String isMany;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java

@@ -121,6 +121,18 @@ public class ContractManageDO extends BaseVOEntity{
     @Excel(name = "其他附件地址")
     private String otherAttachmentsUrl;
 
+    @ApiModelProperty("合同正本附件原始文件名")
+    private String contractOriginalName;
+
+    @ApiModelProperty("廉政协议附件原始文件名")
+    private String integrityAgreementName;
+
+    @ApiModelProperty("安全协议附件原始文件名")
+    private String securityProtocolName;
+
+    @ApiModelProperty("其他附件原始文件名(多文件时与 otherAttachmentsUrl 同分隔符、同顺序)")
+    private String otherAttachmentsName;
+
     @ApiModelProperty("我司签订人")
     @Excel(name = "我司签订人")
     private String ourSinged;
@@ -214,4 +226,6 @@ public class ContractManageDO extends BaseVOEntity{
     @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
     private Integer transportationCosts;
 
+    @ApiModelProperty("一级费用科目code")
+    private String firstSubjectCode;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/service/ContractManageDomainService.java

@@ -60,8 +60,9 @@ public class ContractManageDomainService {
      * 新增合同管理
      */
     public Boolean insert(ContractManageDO contractManageDO) {
-
-        return contractManageService.insert(contractManageDO);
+        Long contractManageId = contractManageService.insert(contractManageDO);
+        contractManageDO.setContractManageId(contractManageId);
+        return true;
     }
 
     /**
@@ -148,6 +149,7 @@ public class ContractManageDomainService {
         LambdaQueryWrapper<ContractManage> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ContractManage::getOriginalContractNumber,contractNumber);
         queryWrapper.eq(ContractManage::getDelFlag,1);
+        queryWrapper.last("LIMIT 1");
         ContractManage contractManage = contractManageService.getOne(queryWrapper);
         if(null != contractManage){
             BeanUtils.copyProperties(contractManage,contractManagePO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/entity/ContractManageDetail.java

@@ -98,4 +98,10 @@ public class ContractManageDetail extends BaseVOEntity{
     @ApiModelProperty("单据类型")
     private String documentType;
 
+    @ApiModelProperty("费用类别编码")
+    private String serviceItemsCode;
+
+    @ApiModelProperty("费用类别名称")
+    private String serviceItemsName;
+
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/po/ContractManageDetailPO.java

@@ -97,4 +97,10 @@ public class ContractManageDetailPO extends BaseVOEntity{
     @ApiModelProperty("单据类型")
     private String documentType;
 
+    @ApiModelProperty("费用类别编码")
+    private String serviceItemsCode;
+
+    @ApiModelProperty("费用类别名称")
+    private String serviceItemsName;
+
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/todo/ContractManageDetailDO.java

@@ -102,4 +102,10 @@ public class ContractManageDetailDO extends BaseVOEntity{
 
     @ApiModelProperty("单据类型")
     private String documentType;
+
+    @ApiModelProperty("费用类别编码")
+    private String serviceItemsCode;
+
+    @ApiModelProperty("费用类别名称")
+    private String serviceItemsName;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/service/ContractManageDetailDomainService.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 /**
  * 合同管理详情
@@ -95,5 +96,29 @@ public class ContractManageDetailDomainService {
         return resultList;
     }
 
+    /**
+     * 根据多个合同管理id批量查询合同科目详情（一次SQL查询，避免逐合同N+1）
+     * @param contractManageIds 合同管理id集合
+     * @return 合同科目详情列表
+     */
+    public List<ContractManageDetailPO> queryListByManageIds(Collection<Long> contractManageIds) {
+        List<ContractManageDetailPO> resultList = new ArrayList<>();
+        if (contractManageIds == null || contractManageIds.isEmpty()) {
+            return resultList;
+        }
+        LambdaQueryWrapper<ContractManageDetail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(ContractManageDetail::getContractManageId, contractManageIds);
+        queryWrapper.eq(ContractManageDetail::getDelFlag, 1);
+        List<ContractManageDetail> contractManageDetails = contractManageDetailService.list(queryWrapper);
+        if (contractManageDetails != null && contractManageDetails.size() > 0) {
+            for (ContractManageDetail contractManageDetail : contractManageDetails) {
+                ContractManageDetailPO contractManageDetailPO = new ContractManageDetailPO();
+                BeanUtils.copyProperties(contractManageDetail, contractManageDetailPO);
+                resultList.add(contractManageDetailPO);
+            }
+        }
+        return resultList;
+    }
+
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/facade/IExpenseAccountService.java

@@ -58,6 +58,11 @@ public interface IExpenseAccountService extends IService<ExpenseAccount>
      */
     ExpenseAccountPO getInfoByCode(ExpenseAccountDO expenseAccountDO);
 
+    /**
+     * 根据费用科目code和组织ID查询费用信息
+     */
+    ExpenseAccountPO getInfoByOrgAndCode(ExpenseAccountDO expenseAccountDO);
+
     public List<QueryExpenseAccountPO> selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO);
 
     public List<QueryExpenseAccountPO> selectOtherExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/mapper/ExpenseAccountMapper.java

@@ -39,6 +39,11 @@ public interface ExpenseAccountMapper extends BaseMapper<ExpenseAccount>
      */
     ExpenseAccountPO getInfoByCode(@Param("expenseAccountDO") ExpenseAccountDO expenseAccountDO);
 
+    /**
+     * 根据费用科目code和组织ID查询费用信息
+     */
+    ExpenseAccountPO getInfoByOrgAndCode(@Param("expenseAccountDO") ExpenseAccountDO expenseAccountDO);
+
     public List<QueryExpenseAccountPO> selectExpenseAccount(@Param("searchExpenseAccountDO") SearchExpenseAccountDO searchExpenseAccountDO);
 
     public List<QueryExpenseAccountPO> selectOtherExpenseAccount(@Param("searchExpenseAccountDO") SearchExpenseAccountDO searchExpenseAccountDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/persistence/ExpenseAccountImpl.java

@@ -129,6 +129,11 @@ public class ExpenseAccountImpl extends ServiceImpl<ExpenseAccountMapper, Expens
         return expenseAccountMapper.getInfoByCode(expenseAccountDO);
     }
 
+    @Override
+    public ExpenseAccountPO getInfoByOrgAndCode(ExpenseAccountDO expenseAccountDO) {
+        return expenseAccountMapper.getInfoByOrgAndCode(expenseAccountDO);
+    }
+
     /**
      * 系统科目查询
      * 社会车辆：service_items_code='SHCL'，upper_subject_code='shcl_clyf'，society_status=1

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import com.mhd.common.core.web.domain.BaseVOEntity;
 
@@ -159,4 +160,8 @@ public class ExpenseAccountPO extends BaseVOEntity{
 
     @ApiModelProperty("nc科目编码")
     private String ncSubjectCode;
+
+    @ApiModelProperty("计费单位列表（单位-单位英文）")
+    private List<Map<String, String>> unit;
+
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/service/ExpenseAccountDomainService.java

@@ -101,6 +101,16 @@ public class ExpenseAccountDomainService {
         expenseAccountDO.setTopOrganizationId(topOrganizationId);
         return expenseAccountService.getInfoByCode(expenseAccountDO);
     }
+
+    /**
+     * 根据编码和组织ID查询费用科目信息
+     */
+    public ExpenseAccountPO getInfoByOrgAndCode(String subjectCode, Long organizationId) {
+        ExpenseAccountDO expenseAccountDO = new ExpenseAccountDO();
+        expenseAccountDO.setSubjectCode(subjectCode);
+        expenseAccountDO.setOrganizationId(organizationId);
+        return expenseAccountService.getInfoByOrgAndCode(expenseAccountDO);
+    }
     public List<QueryExpenseAccountPO> selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){
         return expenseAccountService.selectExpenseAccount(searchExpenseAccountDO);
     }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java

@@ -96,4 +96,7 @@ public class Lease extends BaseVOEntity{
 
     @ApiModelProperty("业务员ID")
     private String salesmanId;
+
+    @ApiModelProperty("状态：1=正常，0=停用")
+    private Integer status;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java

@@ -97,4 +97,7 @@ public class LeasePO extends BaseVOEntity{
 
     @ApiModelProperty("业务员ID")
     private String salesmanId;
+
+    @ApiModelProperty("状态：1=正常，0=停用")
+    private Integer status;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java

@@ -113,4 +113,7 @@ public class LeaseDO extends BaseVOEntity{
 
     @ApiModelProperty("业务员ID")
     private String salesmanId;
+
+    @ApiModelProperty("状态：1=正常，0=停用")
+    private Integer status;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java

@@ -89,4 +89,22 @@ public class LeaseDomainService {
                 .in(Lease::getId, leaseIds)
                 .eq(Lease::getDelFlag, 1));
     }
+
+    /**
+     * 启用/停用租赁
+     * @param leaseIds 租赁ID列表
+     * @param status 目标状态：1=启用，0=停用
+     * @param updateBy 操作人ID
+     * @param updateByName 操作人名称
+     */
+    public Boolean updateStatus(List<Long> leaseIds, Integer status, Long updateBy, String updateByName) {
+        return leaseService.update(new UpdateWrapper<Lease>().lambda()
+                .set(Lease::getStatus, status)
+                .set(Lease::getUpdateBy, updateBy)
+                .set(Lease::getUpdateByName, updateByName)
+                .set(Lease::getUpdateTime, new Date())
+                .in(Lease::getId, leaseIds)
+                .eq(Lease::getDelFlag, 1));
+    }
+
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java

@@ -1,5 +1,6 @@
 package com.mhd.basic.domain.materialBaseInfo.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -44,14 +45,17 @@ public class MaterialBaseInfo extends BaseVOEntity{
 
     @ApiModelProperty("货主id")
     @Excel(name = "货主id")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long shipperId;
 
     @ApiModelProperty("货主名称")
     @Excel(name = "货主名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String shipperName;
 
     @ApiModelProperty("物料编码")
     @Excel(name = "物料编码")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String materialCode;
 
     @ApiModelProperty("物料名称")
@@ -404,4 +408,9 @@ public class MaterialBaseInfo extends BaseVOEntity{
     @ApiModelProperty(name = "收费标准")
     private BigDecimal chargeStandard;
 
+    @ApiModelProperty(name = "组织(多个用,分开)")
+    private String orgId;
+
+    @ApiModelProperty(name = "是否正常物料: 0-是 1-否")
+    private Integer isNormalMaterial;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java

@@ -393,4 +393,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity{
 
     @ApiModelProperty(name = "收费标准")
     private BigDecimal chargeStandard;
+
+    @ApiModelProperty(name = "组织(多个用,分开)")
+    private String orgId;
+
+    @ApiModelProperty(name = "是否正常物料: 0-是 1-否")
+    private Integer isNormalMaterial;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java

@@ -399,4 +399,10 @@ public class MaterialBaseInfoDO extends BaseVOEntity{
 
     @ApiModelProperty(name = "收费标准")
     private BigDecimal chargeStandard;
+
+    @ApiModelProperty(name = "组织(多个用,分开)")
+    private String orgId;
+
+    @ApiModelProperty(name = "是否正常物料: 0-是 1-否")
+    private Integer isNormalMaterial;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java

@@ -165,6 +165,8 @@ public class StorageLocation extends BaseVOEntity{
     @ApiModelProperty("是否作废: 1-否 2-是")
     @Excel(name = "是否作废: 1-否 2-是")
     private Integer nullify;
-
+    @ApiModelProperty("库位条码")
+    @Excel(name = "库位条码")
+    private String locationBarCode;
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java

@@ -165,6 +165,8 @@ public class StorageLocationPO extends BaseVOEntity{
     @Excel(name = "是否作废: 1-否 2-是")
     private Integer nullify;
 
-
+    @ApiModelProperty("库位条码")
+    @Excel(name = "库位条码")
+    private String locationBarCode;
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java

@@ -204,4 +204,8 @@ public class StorageLocationDO extends BaseVOEntity{
     @ApiModelProperty("坐标-层 终止")
     @Excel(name = "坐标-层 终止")
     private String coordinateLayerEnd;
+
+    @ApiModelProperty("库位条码")
+    @Excel(name = "库位条码")
+    private String locationBarCode;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageSection/repository/facade/IStorageSectionService.java

@@ -5,6 +5,7 @@ import com.mhd.basic.domain.storageSection.entity.StorageSection;
 import com.mhd.basic.domain.storageSection.repository.po.StorageSectionPO;
 import com.mhd.basic.domain.storageSection.repository.todo.StorageSectionDO;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -20,6 +21,11 @@ public interface IStorageSectionService extends IService<StorageSection>
      */
     public List<StorageSectionPO> queryList(StorageSectionDO storageSectionDO);
 
+    /**
+     * 库区面积合计（与 queryList 相同筛选条件）
+     */
+    public BigDecimal sumStorageRegion(StorageSectionDO storageSectionDO);
+
     /**
      * 新增库区
      */

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageSection/repository/mapper/StorageSectionMapper.java

@@ -1,5 +1,6 @@
 package com.mhd.basic.domain.storageSection.repository.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mhd.basic.domain.storageSection.entity.StorageSection;
@@ -19,4 +20,9 @@ public interface StorageSectionMapper extends BaseMapper<StorageSection>
      */
     public List<StorageSectionPO> queryList(StorageSectionDO storageSectionDO);
 
+    /**
+     * 库区面积合计（与 queryList 相同筛选条件）
+     */
+    public BigDecimal sumStorageRegion(StorageSectionDO storageSectionDO);
+
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageSection/repository/persistence/StorageSectionImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,6 +34,15 @@ public class StorageSectionImpl extends ServiceImpl<StorageSectionMapper, Storag
         return storageSectionMapper.queryList(storageSectionDO);
     }
 
+    /**
+     * 库区面积合计（与 queryList 相同筛选条件）
+     */
+    @Override
+    public BigDecimal sumStorageRegion(StorageSectionDO storageSectionDO)
+    {
+        return storageSectionMapper.sumStorageRegion(storageSectionDO);
+    }
+
     /**
      * 新增库区
      */