Merge branch 'dev' into feature/dev-0729

1. queryListByWl(物料查询)：原按单物料分组会把同一物料跨仓库库存合并成一行，丢失仓库维度。子查询 partition by 增加 warehouse_id、join 增加 warehouse_id 关联、外层 GROUP BY 增加 warehouse_id，改为按"物料+仓库"汇总。
2. queryListByWlKw(物料/库位查询)：GROUP BY 增加 shipper_id，改为按"货主+库位+物料"汇总，避免不同货主在同库位同物料的库存被错误合并。
3. queryListByHz(按货主查询)：GROUP BY 增加 warehouse_id，改为按"货主+仓库"汇总；hzwl 分支改走 queryListByHz，符合"按货主查询：货主+仓库"需求。

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.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",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.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99: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/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/WlhyServiceFeign.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class)
 public interface WlhyServiceFeign {
 
     /**

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

@@ -21,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.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface WmsServiceFeign {
 
     /**
@@ -141,4 +141,14 @@ public interface WmsServiceFeign {
     @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);
 }

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.33:8018", configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", 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,24 @@ public class InMaterialDetail extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
+
+    @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/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/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/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/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

@@ -85,7 +85,7 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
 
             @Override
             public AjaxResult execution(StockOutOrderDTO stockOutOrderDTO) {
-                return null;
+                return AjaxResult.error(cause.getMessage());
             }
 
             @Override
@@ -119,6 +119,12 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             public AjaxResult genPickingOrderByOms(StockOutOrderDTO stockOutOrderDTO) {
                 return null;
             }
+
+            @Override
+            public AjaxResult batchSignWms(SignatureBatchFeignDTO dto) {
+                log.error("WMS批量签名调用失败");
+                return AjaxResult.error("WMS批量签名调用失败：" + cause.getMessage());
+            }
         };
     }
 }

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/resources/bootstrap.yml

@@ -15,19 +15,20 @@ spring:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
-#        username: nacos
-#        password: manhuoda@2023
-        #线上正式环境
         server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
+        #线上正式环境
+#        server-addr: 10.102.192.5:6848
+#        username: nacos
+#        password: manhuoda@2023
       config:
 #        server-addr: 127.0.0.1:8848
+        server-addr: 10.102.192.31:6848
         # 测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
         # 线上测试环境配置 容器名+端口号
-        #
-        server-addr: 10.102.192.31:6848
+#        server-addr: 10.102.192.5:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境
@@ -36,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,34 @@
+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 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();
+}

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,184 @@
+package com.mhd.bi.domain.biPlatformRealData.service;
+
+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.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 org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * 月台监测-真实数据业务层（封装 YMS 跨库查询）
+ * 注：列名大小写、字段类型需以实际库为准；若 YMS 库无数据/无权限，相关方法应返回空/0，不影响写死字段写入快照
+ */
+@Service
+public class BiPlatformRealDataService {
+
+    @Resource
+    private BiPlatformRealDataMapper biPlatformRealDataMapper;
+
+    public List<RealPlatformVehiclePO> queryVehicles() {
+        try {
+            return biPlatformRealDataMapper.queryVehicles();
+        } catch (Exception 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) {
+            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) {
+            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) {
+            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) {
+            return 0L;
+        }
+    }
+
+    public List<RealTaskLoadPO> queryTaskLoadToday() {
+        try {
+            return biPlatformRealDataMapper.queryTaskLoadToday();
+        } catch (Exception e) {
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    /**
+     * 实时组装月台监测数据：真实字段查 YMS 库，写死字段保留静态值。
+     * 每次调用实时查库，不经过快照表。
+     */
+    public PlatformSurveillanceVO buildRealTimePlatformSurveillance() {
+        Random r = new Random();
+        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(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 = 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();
+            int rate = total > 0 ? (int) Math.round(((double) occ / total) * 100.0) : 0;
+            template.getPlatformOverview().setCurrentOccupancyRate(rate);
+        }
+        long todayTasks = countTodayTasks();
+        if (template.getPlatformOverview() != null) {
+            template.getPlatformOverview().setTodayTasks((int) todayTasks);
+        }
+
+        // 作业车辆状态统计
+        RealVehicleStatusPO vs = 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 = countMonthTasks();
+        if (template.getMonthlyTaskStatistics() != null) {
+            template.getMonthlyTaskStatistics().setTaskTotal((int) monthTasks);
+        }
+
+        // 任务负荷（今日 24 小时）
+        List<RealTaskLoadPO> loads = queryTaskLoadToday();
+        if (!loads.isEmpty() && 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) {
+                    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;
+        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/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,87 @@ 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();
+        // 写死数据复用原 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();
+            int rate = total > 0 ? (int) Math.round(((double) occ / total) * 100.0) : 0;
+            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])
@@ -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,7 @@ 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.biOverallOperation.service.BiOverallOperationReportService;
 import com.mhd.bi.domain.biHkMacaoServiceZone.service.BiHkMacaoServiceZoneReportService;
 import com.mhd.bi.domain.biTransportOperationZone.service.BiTransportOperationZoneReportService;
@@ -48,6 +49,9 @@ public class BiReportApi extends BaseController {
     @Autowired
     private BiPlatformSurveillanceReportService biPlatformSurveillanceReportService;
 
+    @Autowired
+    private BiPlatformRealDataService biPlatformRealDataService;
+
     @Autowired
     private BiOverallOperationReportService biOverallOperationReportService;
 
@@ -92,12 +96,12 @@ public class BiReportApi extends BaseController {
     }
 
     /**
-     * 月台监测指标查询（按照 del_flag=1，按 create_time 最新一条）
+     * 月台监测指标查询（实时查 YMS 库，真实字段 + 写死字段）
      */
-    @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.buildRealTimePlatformSurveillance();
         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/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/bootstrap.yml

@@ -16,12 +16,12 @@ spring:
         # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
 #        server-addr: 10.102.192.5:6848
-#        username: nacos
-#        password: manhuoda@2023
-        #线上正式环境
-        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
+        #线上正式环境
+        server-addr: 10.102.192.31:6848
+#        username: nacos
+#        password: manhuoda@2023
       config:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号

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

@@ -0,0 +1,85 @@
+<?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）：
+         plateNumber  <- qms_main_business.CARNO
+         status       <- qms_main_business.FLOWSTATUS
+         platformId   <- qms_queue_list.WINDOWNAME（按主业务的某个窗口关联键关联；此处用 businessNo = windowNo 关联，根据实际表调整）
+         platformDuration <- qms_main_business.EXITTIME - ENTRYTIME（分钟）
+         appointmentTime <- qms_main_business.CREATE_TIME（创建时间）
+         workFloor    <- qms_window_info.PLATFORMFLOOR（按 platformId 关联窗口号）
+         注：列名按达梦默认大写规则；若实际为小写，请反馈调整 -->
+    <select id="queryVehicles" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO">
+        SELECT
+            mb.CARNO             AS plateNumber,
+            mb.FLOWSTATUS        AS status,
+            ql.WINDOWNAME        AS platformId,
+            CASE
+                WHEN mb.EXITTIME IS NOT NULL AND mb.ENTRYTIME IS NOT NULL
+                THEN CAST((mb.EXITTIME - mb.ENTRYTIME) AS BIGINT)
+                ELSE 0
+            END                  AS platformDuration,
+            TO_CHAR(mb.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS') AS appointmentTime,
+            wi.PLATFORMFLOOR     AS workFloor
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS mb
+        LEFT JOIN NGWL_TEST_YMS.QMS_QUEUE_LIST ql ON ql.MAIN_BUSINESS_ID = mb.ID
+        LEFT JOIN NGWL_TEST_YMS.QMS_WINDOW_INFO wi ON wi.WINDOW_NO = ql.WINDOWNAME
+        WHERE 1=1
+          AND mb.DEL_FLAG = 1
+        ORDER BY mb.CREATE_TIME DESC
+        LIMIT 50
+    </select>
+
+    <!-- 月台概览：totalPlatforms（总条数）、operatingPlatforms（作业状态=占用/作业中） -->
+    <select id="queryPlatformOverview" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO">
+        SELECT
+            COUNT(1) AS totalPlatforms,
+            SUM(CASE WHEN STATUS = 2 THEN 1 ELSE 0 END) AS operatingPlatforms
+        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO
+        WHERE DEL_FLAG = 1
+    </select>
+
+    <!-- 今日作业任务：实际进入时间是今日的 -->
+    <select id="countTodayTasks" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+          AND TRUNC(ENTRYTIME) = TRUNC(SYSDATE)
+    </select>
+
+    <!-- 车辆状态统计：今日的统计（按预约申请时间 / 流程状态） -->
+    <select id="queryVehicleStatusToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO">
+        SELECT
+            SUM(CASE WHEN TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS todayReservedVehicles,
+            SUM(CASE WHEN FLOWSTATUS = '已预约' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS notCheckedIn,
+            SUM(CASE WHEN FLOWSTATUS IN ('已进场','已称重','已装车','二次称重','已结算','已还卡') AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS operatingVehicles,
+            SUM(CASE WHEN FLOWSTATUS = '已出场' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS completedVehicles
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+    </select>
+
+    <!-- 本月任务量：实际进入时间是本月的 -->
+    <select id="countMonthTasks" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+          AND ENTRYTIME IS NOT NULL
+          AND TO_CHAR(ENTRYTIME, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
+    </select>
+
+    <!-- 任务负荷（今日 24 小时时段）：按 HOUR(ENTRYTIME) 统计 -->
+    <select id="queryTaskLoadToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO">
+        SELECT
+            HOUR(ENTRYTIME) AS hourOfDay,
+            COUNT(1) AS taskCount
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+          AND ENTRYTIME IS NOT NULL
+          AND TRUNC(ENTRYTIME) = TRUNC(SYSDATE)
+        GROUP BY HOUR(ENTRYTIME)
+        ORDER BY HOUR(ENTRYTIME)
+    </select>
+</mapper>

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/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-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,24 +13,24 @@ spring:
   cloud:
     nacos:
       discovery:
-#        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: 127.0.0.1:8848
 #        server-addr: 10.102.192.31:6848
-        username: nacos
-        password: manhuoda@2023
+#        username: nacos
+#        password: manhuoda@2023
       config:
-#        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: 127.0.0.1:8848
 #        server-addr: 10.102.192.31:6848
-        username: nacos
-        password: manhuoda@2023
+#        username: nacos
+#        password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
         file-extension: yml   #默认properties
         # 共享配置

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

@@ -270,7 +270,7 @@ public class LeaseApplicationService {
      * 货主租赁明细
      * 定时任务：每天凌晨1点执行，计算前一天的货主租赁明细
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
     public void shipperLeaseDetails() {
         log.info("开始执行货主租赁明细定时任务");
         // 计算前一天的日期，将时间设置为当天的0点0分0秒，只保留日期部分
@@ -537,7 +537,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());

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

@@ -759,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){
@@ -830,8 +834,9 @@ public class ContractManageApplicationService {
                 if (isInsert) {
                     // 新增/复制时使用新插入的合同ID
                     contractManageDetailDO.setContractManageId(contractManageDO.getContractManageId());
-                } else if(null != contractManagePO){
-                    contractManageDetailDO.setContractManageId(contractManagePO.getContractManageId());
+                } else {
+                    // 修改时使用当前正在修改的合同ID，不能用 getInfoByCode1 查到的（避免多条合同 originalContractNumber 相同导致明细错绑）
+                    contractManageDetailDO.setContractManageId(contractManageDO.getContractManageId());
                 }
                 contractManageDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
                 contractManageDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
@@ -977,7 +982,8 @@ public class ContractManageApplicationService {
                         && Objects.equals(item.getContractType(), contractType))
                 .collect(Collectors.toList());
         if (contractManagePOs != null && contractManagePOs.size() > 1) {
-            throw new ServiceException("存在多条相同费用科目的合同，请检查");
+            resultContract.setIsMany("1");
+            return resultContract;
         }
         if(contractManagePOList != null && contractManagePOList.size()>0){
             if(StringUtils.isNotEmpty(settlementCustomersCode)){
@@ -1118,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/domain/contractManage/repository/po/ContractManagePO.java

@@ -183,5 +183,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/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/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/service/StorageSectionDomainService.java

@@ -91,31 +91,15 @@ public class StorageSectionDomainService {
     public Boolean update(StorageSectionDO storageSectionDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-        AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-        if (topOrganizationId == null || topOrganizationId == 0 || associationWarehouseCacheDO == null) {
-            throw new ServiceException("获取当前登陆人组织与登陆仓库失败！");
+        if (topOrganizationId == null || topOrganizationId == 0) {
+            throw new ServiceException("获取当前登陆人组织失败！");
         }
-        checkStorageSectionDuplicate(topOrganizationId, associationWarehouseCacheDO.getWarehouseId(),
+        // 直接用记录自身的 warehouseId 做唯一校验，不再依赖缓存仓库
+        checkStorageSectionDuplicate(topOrganizationId, storageSectionDO.getWarehouseId(),
                 storageSectionDO.getStorageCode(), storageSectionDO.getStorageName(),
                 storageSectionDO.getStorageSectionId());
         //设置仓库
         setWarehouseInfo(storageSectionDO);
-        String storageCode = storageSectionDO.getStorageCode();
-        String storageName = storageSectionDO.getStorageName();
-        Long warehouseId = storageSectionDO.getWarehouseId();
-        List<StorageSection> codelist = storageSectionService.list(new QueryWrapper<StorageSection>().lambda()
-                .eq(StorageSection::getStorageCode, storageCode)
-                .eq(StorageSection::getWarehouseId, warehouseId)
-                .ne(StorageSection::getStorageSectionId, storageSectionDO.getStorageSectionId())
-                .eq(StorageSection::getDelFlag, 1));
-        List<StorageSection> namelist = storageSectionService.list(new QueryWrapper<StorageSection>().lambda()
-                .eq(StorageSection::getStorageName, storageName)
-                .eq(StorageSection::getWarehouseId, warehouseId)
-                .ne(StorageSection::getStorageSectionId, storageSectionDO.getStorageSectionId())
-                .eq(StorageSection::getDelFlag, 1));
-        if ((codelist != null && codelist.size() > 0) || (namelist != null && namelist.size() > 0)) {
-            throw new ServiceException("库区编码或名称已存在");
-        }
         return storageSectionService.update(storageSectionDO);
     }
 

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java

@@ -122,5 +122,28 @@ public class Warehouse extends BaseVOEntity{
     @Excel(name = "是否启用: 1-否 2-是")
     private Integer isEnable;
 
+    @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-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java

@@ -124,5 +124,28 @@ public class WarehousePO extends BaseVOEntity{
     private Integer isEnable;
     @ApiModelProperty("库区集合")
     private List<StorageSectionPO> storageSectionList;
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
 
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
+
+
+    @ApiModelProperty("订单号生成规则")
+    @Excel(name = "单号生成规则")
+    private String orderNoGenerateRule;
+
+    @ApiModelProperty("入库单号首字母前缀")
+    @Excel(name = "入库单号首字母前缀")
+    private String inOrderNoPrefix;
+
+    @ApiModelProperty("出库单号首字母前缀")
+    @Excel(name = "出库单号首字母前缀")
+    private String outOrderNoPrefix;
+
+    @ApiModelProperty("样品出库单号首字母前缀")
+    @Excel(name = "样品出库单号首字母前缀")
+    private String sampleOutOrderNoPrefix;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java

@@ -131,4 +131,29 @@ public class WarehouseDO extends BaseVOEntity{
     private String orgIds;
     @ApiModelProperty("组织id 集合")
     private List<Long> orgIdList;
+
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
+
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
+
+
+    @ApiModelProperty("订单号生成规则")
+    @Excel(name = "单号生成规则")
+    private String orderNoGenerateRule;
+
+    @ApiModelProperty("入库单号首字母前缀")
+    @Excel(name = "入库单号首字母前缀")
+    private String inOrderNoPrefix;
+
+    @ApiModelProperty("出库单号首字母前缀")
+    @Excel(name = "出库单号首字母前缀")
+    private String outOrderNoPrefix;
+
+    @ApiModelProperty("样品出库单号首字母前缀")
+    @Excel(name = "样品出库单号首字母前缀")
+    private String sampleOutOrderNoPrefix;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/ContractManageExportVO.java

@@ -0,0 +1,102 @@
+package com.mhd.basic.interfaces.dto.contractManage;
+
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 合同管理导出对象（合同头字段 + 科目明细字段，拍平为一行一条明细）
+ *
+ * @author gen
+ * @date 2024-06-07
+ */
+@Data
+@ApiModel(value = "合同管理导出对象", description = "合同管理导出对象（含明细）")
+public class ContractManageExportVO {
+
+    /** ====== 合同头字段（与 ContractManagePO 的 @Excel 一致） ====== */
+    @Excel(name = "合同编号")
+    private String contractNumber;
+
+    @Excel(name = "合同名称")
+    private String contractName;
+
+    @Excel(name = "是否通用合同", readConverterExp = "1=是，2=否")
+    private Integer commonContractFlag;
+
+    @Excel(name = "合同类型", readConverterExp = "1=仓储，2=运输，3=其他")
+    private Integer contractType;
+
+    @Excel(name = "合同状态", readConverterExp = "1=未生效，2=使用中，3=已过期，4=已作废")
+    private Integer contractState;
+
+    @Excel(name = "签订单位")
+    private String signingUnit;
+
+    @Excel(name = "结算主体")
+    private String settlementCustomers;
+
+    @Excel(name = "我司身份", readConverterExp = "1=甲方，2=乙方")
+    private Integer ourIdentity;
+
+    @Excel(name = "账期", readConverterExp = "1=每月，2=双月，3=季度")
+    private Integer accountingPeriod;
+
+    @Excel(name = "合同签订日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date signingDate;
+
+    @Excel(name = "合同生效日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date effectiveDate;
+
+    @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expirationDate;
+
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @Excel(name = "客户类型")
+    private String customerType;
+
+    @Excel(name = "是否自动出账", readConverterExp = "1=是，2=否")
+    private Integer automaticFlag;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    /** ====== 明细字段（来源于 contract_manage_detail） ====== */
+    @Excel(name = "结算科目类型", readConverterExp = "1=通用，2=临时")
+    private Integer subjectType;
+
+    @Excel(name = "一级费用科目code")
+    private String firstSubjectCode;
+
+    @Excel(name = "一级费用科目")
+    private String firstSubjectName;
+
+    @Excel(name = "二级费用科目code")
+    private String secondSubjectCode;
+
+    @Excel(name = "二级费用科目")
+    private String secondSubjectName;
+
+    @Excel(name = "计费策略")
+    private String accountingStrategy;
+
+    @Excel(name = "计费周期")
+    private String billingAttributes;
+
+    @Excel(name = "科目生效日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date subjectEffectiveDate;
+
+    @Excel(name = "科目到期日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date subjectExpirationDate;
+
+    @Excel(name = "单据类型")
+    private String documentType;
+
+    @Excel(name = "费用类别")
+    private String serviceItemsName;
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManageDetail/ContractManageDetailDTO.java

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

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java

@@ -212,7 +212,11 @@ public class StorageLocationDTO extends BaseVOEntity{
     @Excel(name = "坐标-层 终止")
     private String coordinateLayerEnd;
 
+    @ApiModelProperty("库位条码")
+    @Excel(name = "库位条码")
+    private String locationBarCode;
+
     public interface Edit {}
 
     public interface BatchInsert {}
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java

@@ -136,4 +136,29 @@ public class WarehouseDTO extends BaseVOEntity{
     private String orgIds;
     @ApiModelProperty("组织id 集合")
     private List<Long> orgIdList;
+
+    @ApiModelProperty("任务模式")
+    @Excel(name = "任务模式")
+    private String taskMode;
+
+    @ApiModelProperty("作业模式")
+    @Excel(name = "作业模式")
+    private String workMode;
+
+
+    @ApiModelProperty("订单号生成规则")
+    @Excel(name = "单号生成规则")
+    private String orderNoGenerateRule;
+
+    @ApiModelProperty("入库单号首字母前缀")
+    @Excel(name = "入库单号首字母前缀")
+    private String inOrderNoPrefix;
+
+    @ApiModelProperty("出库单号首字母前缀")
+    @Excel(name = "出库单号首字母前缀")
+    private String outOrderNoPrefix;
+
+    @ApiModelProperty("样品出库单号首字母前缀")
+    @Excel(name = "样品出库单号首字母前缀")
+    private String sampleOutOrderNoPrefix;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/contractManage/ContractManageApi.java

@@ -1,8 +1,11 @@
 package com.mhd.basic.interfaces.facade.contractManage;
 
+import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.List;
 
 import com.mhd.basic.interfaces.assember.contractManage.ContractManageAssembler;
+import com.mhd.basic.interfaces.dto.contractManage.ContractManageExportVO;
 import com.mhd.basic.interfaces.dto.contractManage.SubjectAndPriceDTO;
 import com.mhd.basic.interfaces.dto.contractManage.SubjectAndPriceReturn;
 import io.swagger.annotations.ApiOperation;
@@ -14,9 +17,11 @@ import com.mhd.basic.domain.contractManage.repository.todo.ContractManageDO;
 import com.mhd.basic.domain.contractManage.repository.po.ContractManagePO;
 import com.mhd.basic.application.service.contractManage.ContractManageApplicationService;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.common.core.utils.poi.ExcelUtil;
 
 /**
  * 合同管理Api
@@ -205,7 +210,24 @@ public class ContractManageApi extends BaseController{
         return AjaxResult.success(list);
     }
 
+    @ApiOperation("导出合同（含明细）")
+    @GetMapping(value = "/export", produces = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+    public void export(ContractManageDTO contractManageDTO, HttpServletResponse response) throws IOException
+    {
+        //转换实体
+        ContractManageDO contractManageDO = new ContractManageDO();
+        BeanUtils.copyProperties(contractManageDTO, contractManageDO);
+        //查询全量（不分页）并拍平明细
+        List<ContractManageExportVO> list = contractManageApplicationService.buildExportList(contractManageDO);
 
+        //设置下载头，防止浏览器乱码
+        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<ContractManageExportVO> util = new ExcelUtil<>(ContractManageExportVO.class);
+        util.exportExcel(response, list, "合同导出");
+    }
 
 }

mhd-modules/mhd-system/src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 #        server-addr: 127.0.0.1:8848
         server-addr: 10.33.0.129:6010
         # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.30:6848
+#        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境
@@ -25,7 +25,7 @@ spring:
 #        server-addr: 127.0.0.1:8848
         server-addr: 10.33.0.129:6010
         # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.102.192.30:6848
+#        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境

mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectContractManagePo">
         SELECT DISTINCT a.*
         FROM CONTRACT_MANAGE a
-                 INNER JOIN CONTRACT_MANAGE_DETAIL b
+                 left JOIN CONTRACT_MANAGE_DETAIL b
                             ON a.CONTRACT_MANAGE_ID = b.CONTRACT_MANAGE_ID
         where
             a.del_flag = 1

mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml

@@ -107,7 +107,10 @@
     <select id="selectCostSubject" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.ExpenseAccountDO"
             resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO">
         select
-        a.*
+        a.* ,
+        b.tax_rate,
+        b.service_items_name,
+        b.service_items_code
         from expense_account a left join service_items_manage b ON a.service_items_manage_id = b.service_items_manage_id
         where
         a.del_flag = 1
@@ -118,13 +121,17 @@
     <select id="selectAllCostSubject"
             resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO">
         select
-            *
-        from expense_account
+            a.* ,
+            b.tax_rate,
+            b.service_items_name,
+            b.service_items_code
+        from expense_account a
+        left join service_items_manage b ON a.service_items_manage_id = b.service_items_manage_id
         where
-            del_flag = 1
-          and status = 1
-          and first_subject_flag = 2
-          and upper_subject_code = #{subjectCode}
+            a.del_flag = 1
+          and a.status = 1
+          and a.first_subject_flag = 2
+          and a.upper_subject_code = #{subjectCode}
     </select>
 
     <select id="getInfoByCode" resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.ExpenseAccountDO">
@@ -141,6 +148,7 @@
           AND a.top_organization_id = #{expenseAccountDO.topOrganizationId}
           AND a.subject_code = #{expenseAccountDO.subjectCode}
           AND a.status = 1
+        LIMIT 1
     </select>
 
 

mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="locationBarCode"    column="LOCATION_BAR_CODE"    />
     </resultMap>
 
 
@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.storage_location_classify, a.storage_location_classify_name, a.storage_location_type, a.storage_location_type_name, 
         a.mixing_strategy, a.mixing_strategy_name, a.storage_location_group_id, a.storage_location_group_code, a.storage_location_group_name, 
         a.weight_limit, a.volume_limit, a.location_size, a.location_length, a.location_width, a.location_height, 
-        a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark, 
+        a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark, a.LOCATION_BAR_CODE,
         a.opening_up, a.nullify, a.status, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag 
         from storage_location a
         LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1
@@ -184,8 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.basic.domain.storageLocation.repository.todo.StorageLocationDO" resultMap="StorageLocationResult">
         <include refid="selectStorageLocationPo"/>
         <include refid="selectStorageLocationPo1"/>
--- 按照创建时间倒序排序
-        order by a.create_time desc
+-- 按照库位名称正序排序，名称相同时按创建时间倒序
+        order by a.storage_location_name asc, a.create_time desc
     </select>
 
     <select id="getStorageLocationCount" parameterType="com.mhd.basic.domain.storageLocation.repository.todo.StorageLocationDO" resultType="java.lang.Long">

mhd-modules/mhd-system/src/main/resources/mapper/basic/storageSection/StorageSectionMapper.xml

@@ -100,6 +100,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.basic.domain.storageSection.repository.todo.StorageSectionDO" resultMap="StorageSectionResult">
         <include refid="selectStorageSectionPo"/>
         <include refid="selectStorageSectionPo1"/>
-        order by a.create_time desc
+        order by a.storage_name asc, a.create_time desc
     </select>
 </mapper>

mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml

@@ -37,11 +37,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="isEnable"    column="IS_ENABLE"    />
+        <result property="workMode"    column="WORK_MODE"    />
+        <result property="taskMode"    column="TASK_MODE"    />
+        <result property="sampleOutOrderNoPrefix"    column="SAMPLE_OUT_ORDER_NO_PREFIX"    />
+        <result property="orderNoGenerateRule"    column="ORDER_NO_GENERATE_RULE"    />
+        <result property="inOrderNoPrefix"    column="IN_ORDER_NO_PREFIX"    />
+        <result property="outOrderNoPrefix"    column="OUT_ORDER_NO_PREFIX"    />
     </resultMap>
 
 
     <sql id="selectWarehousePo">
-        select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name, warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name, director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region, usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag, IS_ENABLE from warehouse
+        select warehouse_id, organization_id, organization_name, top_organization_id, warehouse_code, warehouse_name,
+               warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name,
+               director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region,
+               usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by,
+               update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE,SAMPLE_OUT_ORDER_NO_PREFIX,ORDER_NO_GENERATE_RULE,IN_ORDER_NO_PREFIX,
+               OUT_ORDER_NO_PREFIX
+        from warehouse
     </sql>
 
     <sql id="selectWarehousePo1">

mhd-user-center/src/main/java/com/mhd/user/application/service/AgreementDetailsApplicationService.java

@@ -1,12 +1,22 @@
 package com.mhd.user.application.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.user.domain.userAggregate.entity.AgreementDetails;
+import com.mhd.user.domain.userAggregate.entity.UserShipperEntity;
 import com.mhd.user.domain.userAggregate.repository.mapper.AgreementDetailsMapper;
+import com.mhd.user.domain.userAggregate.repository.mapper.UserShipperMapper;
+import com.mhd.user.domain.userAggregate.repository.po.AgreementDetailsPo;
+import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -19,18 +29,87 @@ public class AgreementDetailsApplicationService {
     @Resource
     private AgreementDetailsMapper agreementDetailsMapper;
 
+    @Resource
+    private UserShipperMapper userShipperMapper;
+
     /**
-     * 根据货主ID查询所有协议明细
+     * 根据货主ID查询当前登录用户组织下的协议明细
+     * 从user_shipper表的orgCode字段解析JSON，匹配当前登录用户组织code，
+     * 返回该组织下的agreedaydatas列表
      *
      * @param shipperId 货主ID
      * @return 协议明细列表
      */
-    public List<AgreementDetails> listByShipperId(Long shipperId) {
-        return agreementDetailsMapper.selectList(
-                new LambdaQueryWrapper<AgreementDetails>()
-                        .eq(AgreementDetails::getShipperId, shipperId)
-                        .orderByDesc(AgreementDetails::getCreateTime)
-        );
+    public List<AgreementDetailsPo> listByShipperId(Long shipperId) {
+        // 1. 获取当前登录用户组织ID
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser) || ObjectUtil.isNull(loginUser.getUserPo())) {
+            log.warn("未获取到登录用户信息");
+            return Collections.emptyList();
+        }
+        Long organizationId = loginUser.getUserPo().getOrganizationId();
+        if (ObjectUtil.isNull(organizationId)) {
+            log.warn("当前登录用户无组织信息");
+            return Collections.emptyList();
+        }
+
+        // 2. 根据shipperId查询货主信息，获取orgCode字段
+        UserShipperEntity shipperEntity = userShipperMapper.selectById(shipperId);
+        if (ObjectUtil.isNull(shipperEntity)) {
+            log.warn("未找到货主信息，shipperId={}", shipperId);
+            return Collections.emptyList();
+        }
+        String orgCodeJson = shipperEntity.getOrgCode();
+        if (ObjectUtil.isNull(orgCodeJson) || orgCodeJson.isEmpty()) {
+            log.warn("货主orgCode为空，shipperId={}", shipperId);
+            return Collections.emptyList();
+        }
+
+        // 3. 解析orgCode JSON数组，匹配当前登录用户组织code
+        JSONArray orgCodeArray = JSONArray.parseArray(orgCodeJson);
+        if (orgCodeArray == null || orgCodeArray.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        JSONObject matchedOrg = null;
+        for (int i = 0; i < orgCodeArray.size(); i++) {
+            JSONObject orgItem = orgCodeArray.getJSONObject(i);
+            Long code = orgItem.getLong("code");
+            if (organizationId.equals(code)) {
+                matchedOrg = orgItem;
+                break;
+            }
+        }
+
+        if (matchedOrg == null) {
+            log.info("未匹配到当前组织的协议信息，shipperId={}，organizationId={}", shipperId, organizationId);
+            return Collections.emptyList();
+        }
+
+        // 4. 获取匹配组织的agreedaydatas
+        JSONArray agreedaydatas = matchedOrg.getJSONArray("agreedaydatas");
+        if (agreedaydatas == null || agreedaydatas.isEmpty()) {
+            log.info("当前组织下无协议天数数据，shipperId={}，organizationId={}", shipperId, organizationId);
+            return Collections.emptyList();
+        }
+
+        // 5. 转换为AgreementDetailsPo列表
+        List<AgreementDetailsPo> result = new ArrayList<>();
+        for (int i = 0; i < agreedaydatas.size(); i++) {
+            JSONObject item = agreedaydatas.getJSONObject(i);
+            AgreementDetailsPo po = new AgreementDetailsPo();
+            po.setCode(item.getString("code"));
+            po.setOrgcode(item.getString("orgcode"));
+            po.setPtypename(item.getString("ptypename"));
+            po.setPtype(item.getString("ptype"));
+            po.setPcode(item.getString("pcode"));
+            po.setPname(item.getString("pname"));
+            po.setPday(item.getString("pday"));
+            result.add(po);
+        }
+
+        log.info("查询协议明细成功，shipperId={}，organizationId={}，共{}条", shipperId, organizationId, result.size());
+        return result;
     }
 
     /**

mhd-user-center/src/main/java/com/mhd/user/application/service/AsyncUserShipperMasterDataSyncService.java

@@ -21,7 +21,7 @@ public class AsyncUserShipperMasterDataSyncService {
     @Resource
     private RedisLock redisLock;
 
-    @Async
+    @Async("taskScheduler")
     public void syncMasterDataAsync(LoginUser loginUser, String lockKey) {
         Long organizationId = loginUser.getUserPo().getOrganizationId();
         try {

mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java

@@ -2942,6 +2942,33 @@ public class UserApplicationService {
         return null;
     }
 
+    /**
+     * 仅根据用户登录账号获取用户信息（不区分组织，SSO等场景使用）
+     */
+    public LoginUser getUserByUserAccount(String userAccount) {
+        UserPo userPo = userDomainService.findByUserAccount(userAccount);
+        if (ObjectUtil.isNotNull(userPo)) {
+            LoginUser sysUser = new LoginUser();
+            sysUser.setUserid(userPo.getUserId());
+            sysUser.setUsername(userPo.getUserAccount());
+            UserDriverPo userDriverPo = userDriverDomainService.selectByUserId(userPo.getUserId());
+            UserShipperPo userShipperPo = userShipperDomainService.selectByUserId(userPo.getUserId());
+            sysUser.setUserPo(userPo);
+            com.mhd.common.core.domain.po.UserDriverPo userDriverPo1 = new com.mhd.common.core.domain.po.UserDriverPo();
+            if(userDriverPo != null){
+                BeanUtils.copyProperties(userDriverPo, userDriverPo1);
+            }
+            sysUser.setUserDriverPo(userDriverPo1);
+            com.mhd.common.core.domain.po.UserShipperPo userShipperPo1 = new com.mhd.common.core.domain.po.UserShipperPo();
+            if (userShipperPo != null){
+                BeanUtils.copyProperties(userShipperPo, userShipperPo1);
+            }
+            sysUser.setUserShipperPo(userShipperPo1);
+            return sysUser;
+        }
+        return null;
+    }
+
     /**
      * @Description 根据用户账号和组织账号获取组织用户信息
      * @Author Alex

mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java

@@ -23,7 +23,10 @@ import com.mhd.common.core.enums.MessageTypeEnum;
 import com.mhd.common.core.enums.WebsocketTypeEnum;
 import com.mhd.common.core.feign.ThirdPartyServiceFeign;
 import com.mhd.common.core.service.jPush.AsyncJPushApplicationService;
+import com.mhd.common.core.utils.AESUtil;
+import com.mhd.common.core.utils.OConvertUtils;
 import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.security.utils.password.PasswordUtil;
 import com.mhd.system.api.FinanceServiceFeign;
 import com.mhd.system.api.WlhyServiceFeign;
 import com.mhd.system.api.domain.UserShipperEntityFeign;
@@ -359,6 +362,254 @@ public class UserShipperApplicationService {
         return result;
     }
 
+    /**
+     * 从 Excel 导入委托方
+     * 模版列：登录账号、公司名称、联系人、联系电话、地址、详细地址、备注、结算币种、NC客户编码
+     */
+    public com.mhd.common.core.web.domain.AjaxResult importShipperFromExcel(org.springframework.web.multipart.MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            return com.mhd.common.core.web.domain.AjaxResult.error("文件不能为空");
+        }
+        try {
+            org.apache.poi.ss.usermodel.Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(file.getInputStream());
+            org.apache.poi.ss.usermodel.Sheet sheet = workbook.getSheetAt(0);
+            int total = 0, success = 0, failed = 0;
+            java.util.List<String> errors = new java.util.ArrayList<>();
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser == null || loginUser.getUserPo() == null) {
+                return com.mhd.common.core.web.domain.AjaxResult.error("登录信息失效");
+            }
+            Long currentOrgId = loginUser.getUserPo().getOrganizationId();
+            String currentOrgName = loginUser.getUserPo().getOrganizationName();
+            for (int i = 1; i <= sheet.getLastRowNum(); i++) {
+                org.apache.poi.ss.usermodel.Row row = sheet.getRow(i);
+                if (row == null) continue;
+                String userAccount = getCellStr(row.getCell(0));
+                String companyName = getCellStr(row.getCell(1));
+                if (org.springframework.util.StringUtils.isEmpty(companyName)) continue;
+                total++;
+                try {
+                    String contactName = getCellStr(row.getCell(2));
+                    String contactPhone = getCellStr(row.getCell(3));
+                    String address = getCellStr(row.getCell(4));
+                    String detailedAddress = getCellStr(row.getCell(5));
+                    String remark = getCellStr(row.getCell(6));
+                    String settlementCurrency = getCellStr(row.getCell(7));
+                    String ncCustomerCode = getCellStr(row.getCell(8));
+
+                    // 先按公司名称查是否已存在委托方
+                    UserShipperEntity existingShipper = findFirstByShipperEnterpriseNameAcrossOrgs(companyName);
+                    if (existingShipper != null && existingShipper.getShipperId() != null) {
+                        // 已存在：按模板更新指定字段
+                        updateShipperFromExcel(existingShipper, userAccount, companyName,
+                                contactName, contactPhone, address, detailedAddress,
+                                remark, settlementCurrency, ncCustomerCode, loginUser, currentOrgId);
+                        success++;
+                    } else {
+                        UserShipperDO shipperDO = new UserShipperDO();
+                        shipperDO.setShipperType(2);
+                        shipperDO.setDataSource(2);
+                        shipperDO.setUserAccount(userAccount);
+                        shipperDO.setShipperEnterpriseName(companyName);
+                        // NC客户编码使用模板中的独立字段，不再复用登录账号
+                        shipperDO.setCustomerNcCode(ncCustomerCode);
+                        // 联系人 -> user表 user_name + user_shipper表 user_name_shipper
+                        shipperDO.setUserName(contactName);
+                        shipperDO.setUserNameShipper(contactName);
+                        // 联系电话 -> user表 user_phone
+                        shipperDO.setUserPhone(contactPhone);
+                        // 地址 -> user表 user_area_name，详细地址 -> user表 user_area_address
+                        shipperDO.setUserAreaName(address);
+                        shipperDO.setUserAreaAddress(detailedAddress);
+                        shipperDO.setRemark(remark);
+                        shipperDO.setSettlementCurrency(settlementCurrency);
+                        // 新导入账号默认密码 Aa123456（按前端加密约定先 AES 加密）
+                        shipperDO.setUserPassword(AESUtil.encrypt("Aa123456"));
+                        // 初始化 orgCode：记录当前组织信息和NC客户编码
+                        com.alibaba.fastjson.JSONArray orgCodeArray = new com.alibaba.fastjson.JSONArray();
+                        com.alibaba.fastjson.JSONObject orgItem = new com.alibaba.fastjson.JSONObject();
+                        orgItem.put("name", currentOrgName);
+                        orgItem.put("code", currentOrgId);
+                        orgItem.put("ncCustomer", ncCustomerCode);
+                        orgItem.put("names", currentOrgId);
+                        orgCodeArray.add(orgItem);
+                        shipperDO.setOrgCode(orgCodeArray.toJSONString());
+                        Map<String, Object> addResult = addShipper(shipperDO);
+                        Object newUserIdObj = addResult.get("userId");
+                        if (newUserIdObj instanceof Long) {
+                            assignCompanyRoleIfMissing((Long) newUserIdObj, currentOrgId);
+                        }
+                        success++;
+                    }
+                } catch (Exception e) {
+                    failed++;
+                    errors.add("第" + (i + 1) + "行[" + companyName + "]导入失败：" + e.getMessage());
+                    log.error("导入委托方第{}行失败", i + 1, e);
+                }
+            }
+            workbook.close();
+            java.util.Map<String, Object> result = new java.util.HashMap<>();
+            result.put("total", total);
+            result.put("success", success);
+            result.put("failed", failed);
+            result.put("errorMessages", errors);
+            return com.mhd.common.core.web.domain.AjaxResult.success("导入完成", result);
+        } catch (Exception e) {
+            log.error("解析Excel失败", e);
+            return com.mhd.common.core.web.domain.AjaxResult.error("解析Excel失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 导入时若账号没有任何角色，则补分配企业货主角色
+     */
+    private void assignCompanyRoleIfMissing(Long userId, Long organizationId) {
+        if (userId == null || organizationId == null) {
+            return;
+        }
+        List<UserRoleMenuPO> existingRoles = userRoleDomainService.selectRolesByUserId(userId);
+        if (CollUtil.isNotEmpty(existingRoles)) {
+            return;
+        }
+        // 按 role_code + organization_id 精确匹配角色（selectByOrganizationIdAndRoleCode 的 common_where 不含 roleCode 过滤，不适用）
+        RolePO rolePO = roleDomainService.selectByRoleCodeAndOrganizationId(RoleEnum.COMPANY.getCode(), organizationId);
+        if (rolePO == null) {
+            log.warn("组织{}下未找到{}角色，无法为导入用户{}分配角色", organizationId, RoleEnum.COMPANY.getCode(), userId);
+            return;
+        }
+        // 1. 写入 user_role 表
+        UserRoleDo userRoleDo = new UserRoleDo();
+        userRoleDo.setUserId(userId);
+        userRoleDo.setRoleId(rolePO.getRoleId());
+        userRoleDomainService.addUserRole(userRoleDo);
+        // 2. 同步更新 user 表的 role_code / role_name
+        UserDO userDO = new UserDO();
+        userDO.setUserId(userId);
+        userDO.setRoleCode(RoleEnum.COMPANY.getCode());
+        userDO.setRoleName(RoleEnum.COMPANY.getName());
+        userDomainService.updateUser(userDO);
+    }
+
+    /**
+     * 按Excel模板更新已存在的委托方（只更新模板中的字段）
+     */
+    private void updateShipperFromExcel(UserShipperEntity existingShipper, String userAccount,
+                                        String companyName, String contactName, String contactPhone,
+                                        String address, String detailedAddress, String remark,
+                                        String settlementCurrency, String ncCustomerCode,
+                                        LoginUser loginUser, Long currentOrgId) {
+        Long userId = existingShipper.getUserId();
+        // 从 user 主表读取当前登录账号（user_shipper 表无 user_account 字段）
+        UserPo existingUser = null;
+        String existingUserAccount = null;
+        if (userId != null) {
+            existingUser = userDomainService.selectByUserId(userId);
+            if (existingUser != null) {
+                existingUserAccount = existingUser.getUserAccount();
+            }
+        }
+        if (StringUtils.isBlank(existingUserAccount) && StringUtils.isBlank(userAccount)) {
+            throw new ServiceException("登录账号不能为空");
+        }
+        // 登录账号变更时校验唯一性
+        if (StringUtils.isNotBlank(userAccount) && !userAccount.equals(existingUserAccount)) {
+            UserDO checkDO = new UserDO();
+            checkDO.setUserAccount(userAccount);
+            checkDO.setTopOrganizationId(existingShipper.getTopOrganizationId());
+            UserPo existedUser = userDomainService.findByTopOrganizationIdAndUserAccount(checkDO);
+            if (existedUser != null && !existedUser.getUserId().equals(userId)) {
+                throw new ServiceException("登录账号已存在：" + userAccount);
+            }
+        }
+        Date now = new Date();
+        Long updateBy = loginUser.getUserPo().getUserId();
+        String updateByName = loginUser.getUserPo().getUserName();
+
+        // 1. 更新 user_shipper 表指定字段
+        // 注意：user_shipper 表没有 user_account 字段，登录账号在 user 主表维护
+        UserShipperEntity shipperUpdate = new UserShipperEntity();
+        shipperUpdate.setShipperId(existingShipper.getShipperId());
+        shipperUpdate.setShipperEnterpriseName(companyName);
+        shipperUpdate.setUserNameShipper(contactName);
+        shipperUpdate.setUserAreaName(address);
+        shipperUpdate.setUserAreaAddress(detailedAddress);
+        shipperUpdate.setRemark(remark);
+        shipperUpdate.setSettlementCurrency(settlementCurrency);
+        shipperUpdate.setCustomerNcCode(ncCustomerCode);
+        shipperUpdate.setUpdateBy(updateBy);
+        shipperUpdate.setUpdateByName(updateByName);
+        shipperUpdate.setUpdateTime(now);
+        userShipperMapper.updateById(shipperUpdate);
+
+        // 2. 同步更新 user 表指定字段
+        if (userId != null) {
+            UserDO userDO = new UserDO();
+            userDO.setUserId(userId);
+            if (StringUtils.isNotBlank(userAccount)) {
+                userDO.setUserAccount(userAccount);
+            }
+            userDO.setUserName(contactName);
+            userDO.setUserPhone(contactPhone);
+            userDO.setUserAreaName(address);
+            userDO.setUserAreaAddress(detailedAddress);
+            userDO.setUpdateBy(updateBy);
+            userDO.setUpdateByName(updateByName);
+            userDO.setUpdateTime(now);
+            // 如果现有账号没有密码，设置默认密码 Aa123456（与 addUserInfoShipper 一致的加密流程）
+            if (existingUser != null && StringUtils.isBlank(existingUser.getUserPassword())) {
+                String finalAccount = StringUtils.isNotBlank(userAccount) ? userAccount : existingUser.getUserAccount();
+                String salt = OConvertUtils.randomGen(8);
+                String passwordEncode = PasswordUtil.encrypt(finalAccount, "Aa123456", salt);
+                userDO.setUserPassword(passwordEncode);
+                userDO.setUserSalt(salt);
+            }
+            userDomainService.updateUser(userDO);
+            // 如果该账号没有任何角色，补分配企业货主角色，避免登录报“账号未授权角色信息”
+            assignCompanyRoleIfMissing(userId, existingShipper.getOrganizationId());
+        }
+
+        // 3. 更新 orgCode 中当前组织的 ncCustomer
+        String existingOrgCode = existingShipper.getOrgCode();
+        com.alibaba.fastjson.JSONArray orgCodeArray = new com.alibaba.fastjson.JSONArray();
+        boolean hasOrg = false;
+        if (StringUtils.isNotEmpty(existingOrgCode)) {
+            try {
+                orgCodeArray = com.alibaba.fastjson.JSONArray.parseArray(existingOrgCode);
+                for (int i = 0; i < orgCodeArray.size(); i++) {
+                    com.alibaba.fastjson.JSONObject orgItem = orgCodeArray.getJSONObject(i);
+                    if (currentOrgId != null && currentOrgId.equals(orgItem.getLong("code"))) {
+                        orgItem.put("ncCustomer", ncCustomerCode);
+                        hasOrg = true;
+                    }
+                }
+            } catch (Exception e) {
+                log.error("解析orgCode失败，shipperId={}", existingShipper.getShipperId(), e);
+            }
+        }
+        if (!hasOrg) {
+            com.alibaba.fastjson.JSONObject newOrgItem = new com.alibaba.fastjson.JSONObject();
+            newOrgItem.put("name", loginUser.getUserPo().getOrganizationName());
+            newOrgItem.put("code", currentOrgId);
+            newOrgItem.put("ncCustomer", ncCustomerCode);
+            newOrgItem.put("names", currentOrgId);
+            orgCodeArray.add(newOrgItem);
+        }
+        UserShipperEntity orgCodeUpdate = new UserShipperEntity();
+        orgCodeUpdate.setShipperId(existingShipper.getShipperId());
+        orgCodeUpdate.setOrgCode(orgCodeArray.toJSONString());
+        orgCodeUpdate.setUpdateBy(updateBy);
+        orgCodeUpdate.setUpdateByName(updateByName);
+        orgCodeUpdate.setUpdateTime(now);
+        userShipperMapper.updateById(orgCodeUpdate);
+    }
+
+    private String getCellStr(org.apache.poi.ss.usermodel.Cell cell) {
+        if (cell == null) return null;
+        cell.setCellType(org.apache.poi.ss.usermodel.CellType.STRING);
+        String v = cell.getStringCellValue();
+        return v == null ? null : v.trim();
+    }
+
     /**
      * 个人货主认证
      *
@@ -1055,6 +1306,12 @@ public class UserShipperApplicationService {
         return userShipperDomainService.userShipperList(userShipperDO);
     }
 
+    public List<UserShipperPo> userShipperListAllByOrg(Long orgCode) {
+        UserShipperDO userShipperDO = new UserShipperDO();
+        userShipperDO.setOrganizationId(orgCode);
+        return userShipperDomainService.userShipperList(userShipperDO);
+    }
+
     /**
      * E签宝回调接口-认证授权完成
      * @param jsonObject 回调参数
@@ -1349,6 +1606,82 @@ public class UserShipperApplicationService {
                 organizationId);
     }
 
+    /**
+     * 按公司名跨组织查询第一个未删除的委托方（包含 orgCode）。
+     * 用于 MDM 同步时：同公司名可能在不同组织下 nc 编码不同，但本地是同一条委托方记录。
+     */
+    public UserShipperEntity findFirstByShipperEnterpriseNameAcrossOrgs(String shipperEnterpriseName) {
+        if (StringUtils.isEmpty(shipperEnterpriseName)) {
+            return null;
+        }
+        return userShipperMapper.findFirstByShipperEnterpriseNameAcrossOrgs(shipperEnterpriseName.trim());
+    }
+
+    /**
+     * 在已存在的同公司名委托方（可能属于其他组织）的 orgCode JSON 数组中追加当前组织信息。
+     * 若目标组织已存在于数组中则跳过（不重复追加）。
+     *
+     * @param existingShipper        本地已存在的同公司名委托方
+     * @param targetOrganizationId   当前同步组织 ID
+     * @param targetOrganizationName 当前同步组织名称
+     * @param ncCustomerCode         MDM 客商 code（作为该组织下的 ncCustomer 记录）
+     * @param loginUser              登录用户（用于写入 updateBy）
+     * @return true 表示实际写入（新增组织或已存在都返回 true，方便调用方统计），false 表示参数无效
+     */
+    public boolean appendOrganizationToExistingShipper(UserShipperEntity existingShipper,
+                                                      Long targetOrganizationId, String targetOrganizationName,
+                                                      String ncCustomerCode, LoginUser loginUser) {
+        if (existingShipper == null) {
+            return false;
+        }
+        String existingOrgCode = existingShipper.getOrgCode();
+
+        boolean hasOrg = false;
+        com.alibaba.fastjson.JSONArray orgCodeArray = new com.alibaba.fastjson.JSONArray();
+        if (StringUtils.isNotEmpty(existingOrgCode)) {
+            try {
+                orgCodeArray = com.alibaba.fastjson.JSONArray.parseArray(existingOrgCode);
+                // 检查是否已包含当前组织
+                for (int i = 0; i < orgCodeArray.size(); i++) {
+                    com.alibaba.fastjson.JSONObject orgItem = orgCodeArray.getJSONObject(i);
+                    Long itemCode = orgItem.getLong("code");
+                    if (targetOrganizationId != null && targetOrganizationId.equals(itemCode)) {
+                        hasOrg = true;
+                        break;
+                    }
+                }
+            } catch (Exception e) {
+                log.error("解析orgCode失败，shipperId={}", existingShipper.getShipperId(), e);
+            }
+        }
+
+        if (!hasOrg) {
+            // 添加新组织到orgCode数组
+            com.alibaba.fastjson.JSONObject newOrgItem = new com.alibaba.fastjson.JSONObject();
+            newOrgItem.put("name", targetOrganizationName);
+            newOrgItem.put("code", targetOrganizationId);
+            newOrgItem.put("ncCustomer", ncCustomerCode);
+            newOrgItem.put("names", targetOrganizationId);
+            orgCodeArray.add(newOrgItem);
+
+            // 更新委托方的orgCode字段
+            existingShipper.setOrgCode(orgCodeArray.toJSONString());
+            if (loginUser != null && loginUser.getUserPo() != null) {
+                existingShipper.setUpdateBy(loginUser.getUserPo().getUserId());
+                existingShipper.setUpdateByName(loginUser.getUserPo().getUserName());
+            }
+            existingShipper.setUpdateTime(new Date());
+            userShipperMapper.updateById(existingShipper);
+
+            log.info("委托方已存在，添加新组织到orgCode，customerNcCode={}，新增组织code={}，name={}",
+                    ncCustomerCode, targetOrganizationId, targetOrganizationName);
+        } else {
+            log.info("委托方已存在且已包含该组织，跳过添加，customerNcCode={}，组织code={}",
+                    ncCustomerCode, targetOrganizationId);
+        }
+        return true;
+    }
+
     public static String buildMasterDataMatchKey(String ncCode, String companyName) {
         return normalizeMasterDataKey(ncCode) + "|" + normalizeMasterDataKey(companyName);
     }
@@ -1374,61 +1707,8 @@ public class UserShipperApplicationService {
             throw new ServiceException("获取组织配置失败");
         }
 
-        // 检查是否已存在相同customerNcCode的委托方（可能在不同组织）
-        List<UserShipperEntity> existingShippers = userShipperMapper.selectList(
-                new LambdaQueryWrapper<UserShipperEntity>()
-                        .eq(UserShipperEntity::getShipperEnterpriseName, record.getDesc1())
-                        .eq(UserShipperEntity::getDelFlag, 1));
-        
-        if (CollUtil.isNotEmpty(existingShippers)) {
-            // 找到已存在的委托方，检查是否已经有该组织
-            UserShipperEntity existingShipper = existingShippers.get(0);
-            String existingOrgCode = existingShipper.getOrgCode();
-            
-            boolean hasOrg = false;
-            com.alibaba.fastjson.JSONArray orgCodeArray = new com.alibaba.fastjson.JSONArray();
-            if (StringUtils.isNotEmpty(existingOrgCode)) {
-                try {
-                    orgCodeArray = com.alibaba.fastjson.JSONArray.parseArray(existingOrgCode);
-                    // 检查是否已包含当前组织
-                    for (int i = 0; i < orgCodeArray.size(); i++) {
-                        com.alibaba.fastjson.JSONObject orgItem = orgCodeArray.getJSONObject(i);
-                        Long itemCode = orgItem.getLong("code");
-                        if (targetOrganizationId.equals(itemCode)) {
-                            hasOrg = true;
-                            break;
-                        }
-                    }
-                } catch (Exception e) {
-                    log.error("解析orgCode失败，shipperId={}", existingShipper.getShipperId(), e);
-                }
-            }
-            
-            if (!hasOrg) {
-                // 添加新组织到orgCode数组
-                com.alibaba.fastjson.JSONObject newOrgItem = new com.alibaba.fastjson.JSONObject();
-                newOrgItem.put("name", targetOrganizationName);
-                newOrgItem.put("code", targetOrganizationId);
-                newOrgItem.put("ncCustomer", record.getCode());
-                newOrgItem.put("names", targetOrganizationId);
-                orgCodeArray.add(newOrgItem);
-                
-                // 更新委托方的orgCode字段
-                existingShipper.setOrgCode(orgCodeArray.toJSONString());
-                existingShipper.setUpdateBy(loginUser.getUserPo().getUserId());
-                existingShipper.setUpdateByName(loginUser.getUserPo().getUserName());
-                existingShipper.setUpdateTime(new Date());
-                userShipperMapper.updateById(existingShipper);
-                
-                log.info("委托方已存在，添加新组织到orgCode，customerNcCode={}，新增组织code={}，name={}",
-                        record.getCode(), targetOrganizationId, targetOrganizationName);
-            } else {
-                log.info("委托方已存在且已包含该组织，跳过添加，customerNcCode={}，组织code={}",
-                        record.getCode(), targetOrganizationId);
-            }
-            return;  // 不新增，直接返回
-        }
-        
+        // 按公司名跨组织匹配已存在委托方的逻辑已迁移到 doSync 层（先调用 appendOrganizationToExistingShipper），
+        // 走到这里说明按 ncCode+companyName 与公司名均未匹配到，本方法只负责"新增"。
         // 不存在相同的委托方，执行新增逻辑
         UserShipperDO userShipperDO = buildShipperDOFromMasterData(record, loginUser,
                 targetOrganizationId, targetOrganizationName, targetTopOrganizationId);
@@ -1441,6 +1721,16 @@ public class UserShipperApplicationService {
         userShipperDO.setAuthType(2);
         userShipperDO.setShipperAuthStatus(3);
 
+        // 初始化 orgCode：新加的客商属于当前组织，将当前组织信息写入 orgCode JSON 数组
+        com.alibaba.fastjson.JSONArray orgCodeArray = new com.alibaba.fastjson.JSONArray();
+        com.alibaba.fastjson.JSONObject orgItem = new com.alibaba.fastjson.JSONObject();
+        orgItem.put("name", targetOrganizationName);
+        orgItem.put("code", targetOrganizationId);
+        orgItem.put("ncCustomer", record.getCode());
+        orgItem.put("names", targetOrganizationId);
+        orgCodeArray.add(orgItem);
+        userShipperDO.setOrgCode(orgCodeArray.toJSONString());
+
         String userAccount = buildMasterDataUserAccount(record.getCode());
         checkUserAccountUnique(userAccount, null, configSwitch.getTopOrganizationId());
         userShipperDO.setUserAccount(userAccount);
@@ -1556,7 +1846,7 @@ public class UserShipperApplicationService {
                                                         Long targetOrganizationId, String targetOrganizationName,
                                                         Long targetTopOrganizationId) {
         UserShipperDO userShipperDO = new UserShipperDO();
-        userShipperDO.setCustomerNcCode(record.getCode());
+        userShipperDO.setCustomerNcCode(record.getDesc17());  // NC编码用desc17，与匹配Key一致
         userShipperDO.setUserMemberCode(record.getCode());
         userShipperDO.setShipperEnterpriseName(record.getDesc1());
         userShipperDO.setUserNameShipper(record.getDesc1());

mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java

@@ -13,6 +13,7 @@ import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.redis.service.RedisLock;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
+import com.mhd.user.domain.userAggregate.entity.UserShipperEntity;
 import com.mhd.user.domain.userAggregate.repository.po.UserShipperPo;
 import com.mhd.user.domain.userShipperMdmSync.entity.UserShipperMdmSyncEntity;
 import com.mhd.user.domain.userShipperMdmSync.mapper.UserShipperMdmSyncMapper;
@@ -69,13 +70,28 @@ public class UserShipperMasterDataSyncService {
     public void syncMasterData() {
         LoginUser loginUser = requireLoginUser();
         Long organizationId = loginUser.getUserPo().getOrganizationId();
-        String lockKey = LOCK_PREFIX + organizationId;
-        boolean locked = redisLock.tryLock(lockKey, SYNC_LOCK_MINUTES, TimeUnit.MINUTES);
-        if (!locked) {
-            throw new ServiceException("当前组织正在同步主数据，请稍后再试");
-        }
-        markSyncInProgress(organizationId);
-        asyncUserShipperMasterDataSyncService.syncMasterDataAsync(loginUser, lockKey);
+        new Thread(() -> {
+            String lockKey = LOCK_PREFIX + organizationId;
+            try {
+                boolean locked = redisLock.tryLock(lockKey, SYNC_LOCK_MINUTES, TimeUnit.MINUTES);
+                if (!locked) {
+                    log.warn("当前组织正在同步主数据，跳过本次同步");
+                    return;
+                }
+                markSyncInProgress(organizationId);
+                try {
+                    ShipperMasterDataSyncResultVo resultVo = doSync(loginUser);
+                    log.info("MDM同步完成: {}", resultVo);
+                } catch (Exception e) {
+                    log.error("同步主数据失败, organizationId={}", organizationId, e);
+                    markSyncFailed(organizationId, e.getMessage());
+                } finally {
+                    redisLock.unlock(lockKey);
+                }
+            } catch (Exception e) {
+                log.error("获取同步锁失败", e);
+            }
+        }, "mdm-sync-thread").start();
     }
 
     public ShipperMasterDataSyncResultVo executeSync(LoginUser loginUser) {
@@ -184,14 +200,31 @@ public class UserShipperMasterDataSyncService {
                             targetOrganizationId, organizationId, topOrganizationId, loginUser);
                     UserShipperPo existing = existingMap.get(matchKey);
                     if (existing == null) {
-                        userShipperApplicationService.addEnterpriseShipperFromMasterData(
-                                record, loginUser, saveTarget.getOrganizationId(),
-                                saveTarget.getOrganizationName(), saveTarget.getTopOrganizationId());
-                        resultVo.setAddCount(resultVo.getAddCount() + 1);
-                        UserShipperPo added = userShipperApplicationService.findByCustomerNcCodeAndCompanyName(
-                                ncCode, companyName, saveTarget.getOrganizationId());
-                        if (added != null) {
-                            existingMap.put(matchKey, added);
+                        // 按 ncCode+companyName 未匹配到时，再按公司名跨组织查询已存在的同公司名委托方。
+                        // 同一个客商在 MDM 中可能属于不同组织（nc 编码不同），但本地是同一条委托方记录。
+                        // 如果匹配到的委托方属于“另外的组织”（非当前同步组织），则不新增，
+                        // 而是在其 orgCode 上追加当前同步组织的信息（连同本组织下的 ncCustomer）。
+                        UserShipperEntity existingByName = userShipperApplicationService
+                                .findFirstByShipperEnterpriseNameAcrossOrgs(companyName);
+                        if (existingByName != null
+                                && saveTarget.getOrganizationId() != null
+                                && !saveTarget.getOrganizationId().equals(existingByName.getOrganizationId())) {
+                            userShipperApplicationService.appendOrganizationToExistingShipper(
+                                    existingByName, saveTarget.getOrganizationId(),
+                                    saveTarget.getOrganizationName(), ncCode, loginUser);
+                            resultVo.setLinkCount(resultVo.getLinkCount() + 1);
+                            log.info("MDM同步按公司名跨组织合并：customerNcCode={}，companyName={}，本组织code={}，已存在委托方shipperId={}（其他组织）",
+                                    ncCode, companyName, saveTarget.getOrganizationId(), existingByName.getShipperId());
+                        } else {
+                            userShipperApplicationService.addEnterpriseShipperFromMasterData(
+                                    record, loginUser, saveTarget.getOrganizationId(),
+                                    saveTarget.getOrganizationName(), saveTarget.getTopOrganizationId());
+                            resultVo.setAddCount(resultVo.getAddCount() + 1);
+                            UserShipperPo added = userShipperApplicationService.findByCustomerNcCodeAndCompanyName(
+                                    ncCode, companyName, saveTarget.getOrganizationId());
+                            if (added != null) {
+                                existingMap.put(matchKey, added);
+                            }
                         }
                     } else {
                         userShipperApplicationService.updateEnterpriseShipperFromMasterData(
@@ -261,8 +294,9 @@ public class UserShipperMasterDataSyncService {
         entity.setLastSyncTime(syncTime);
         entity.setSyncStatus(resultVo.getFailCount() > 0 ? 2 : 1);
         String syncMessage = String.format(
-                "新增%d，更新%d，跳过%d，失败%d；组织NC=%s；跳过明细[组织不匹配:%d,非客户:%d,内部单位:%d,停用:%d,其他:%d]",
-                resultVo.getAddCount(), resultVo.getUpdateCount(), resultVo.getSkipCount(), resultVo.getFailCount(),
+                "新增%d，更新%d，关联%d，跳过%d，失败%d；组织NC=%s；跳过明细[组织不匹配:%d,非客户:%d,内部单位:%d,停用:%d,其他:%d]",
+                resultVo.getAddCount(), resultVo.getUpdateCount(), resultVo.getLinkCount(),
+                resultVo.getSkipCount(), resultVo.getFailCount(),
                 orgNcCode, skipOrgMismatch, skipNotCustomer, skipInternalOrg, skipDisabled, skipOther);
         if (resultVo.getFailCount() > 0 && !resultVo.getErrorMessages().isEmpty()) {
             syncMessage += "；" + resultVo.getErrorMessages().get(0);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserRepositoryInterface.java

@@ -31,6 +31,12 @@ public interface UserRepositoryInterface extends IService<UserEntity> {
 
 
     UserPo findByTopOrganizationIdAndUserAccount(UserDO userDO);
+
+    /**
+     * 仅根据用户登录账号查询用户（不区分组织，SSO等场景使用）
+     */
+    UserPo findByUserAccount(String userAccount);
+
     UserPo getUserByDingUserId(String dingUserId);
 
     UserPo selectUserShipperList(UserPo userPo);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java

@@ -33,6 +33,11 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     UserPo findByTopOrganizationIdAndUserAccount(UserDO userDO);
 
+    /**
+     * 仅根据用户登录账号查询用户（不区分组织，SSO等场景使用）
+     */
+    UserPo findByUserAccount(@Param("userAccount") String userAccount);
+
     UserPo getUserByDingUserId(@Param("dingUserId") String dingUserId);
 
     UserPo findByTopOrganizationIdAndUserPhone(UserDO userDO);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java

@@ -52,5 +52,11 @@ public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
                                                      @Param("companyName") String companyName,
                                                      @Param("organizationId") Long organizationId);
 
+    /**
+     * 按公司名跨组织查询第一个未删除的委托方（包含 orgCode 字段）。
+     * 用于 MDM 同步时按"公司名"匹配已存在的委托方（可能是其他组织的），以便在其 orgCode 上追加新组织。
+     */
+    UserShipperEntity findFirstByShipperEnterpriseNameAcrossOrgs(@Param("shipperEnterpriseName") String shipperEnterpriseName);
+
     String getOrgNcCode(Long organizationId);
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserRepositoryImpl.java

@@ -79,6 +79,11 @@ public class UserRepositoryImpl extends ServiceImpl<UserMapper,UserEntity> imple
         return userMapper.findByTopOrganizationIdAndUserAccount(userDO);
     }
 
+    @Override
+    public UserPo findByUserAccount(String userAccount) {
+        return userMapper.findByUserAccount(userAccount);
+    }
+
     @Override
     public UserPo getUserByDingUserId(String dingUserId) {
         return userMapper.getUserByDingUserId(dingUserId);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/AgreementDetailsPo.java

@@ -0,0 +1,32 @@
+package com.mhd.user.domain.userAggregate.repository.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 协议天数PO
+ */
+@Data
+public class AgreementDetailsPo {
+
+    @ApiModelProperty("客户编码")
+    private String code;
+
+    @ApiModelProperty("协议组织编码")
+    private String orgcode;
+
+    @ApiModelProperty("协议类型名称")
+    private String ptypename;
+
+    @ApiModelProperty("协议类型：1-付款协议天数，2-收款协议天数")
+    private String ptype;
+
+    @ApiModelProperty("财务系统协议编码")
+    private String pcode;
+
+    @ApiModelProperty("协议天数名称")
+    private String pname;
+
+    @ApiModelProperty("协议天数")
+    private String pday;
+}

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java

@@ -244,6 +244,12 @@ public class UserShipperDO extends UserDO {
     @ApiModelProperty("货主/供应商/客户名称")
     private String userNameShipper;
 
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @ApiModelProperty("用户电话")
+    private String userPhone;
+
     @ApiModelProperty("联系人")
     private String emergencyContactName;
 

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDomainService.java

@@ -82,6 +82,13 @@ public class UserDomainService {
         return userRepositoryInterface.findByTopOrganizationIdAndUserAccount(userDO);
     }
 
+    /**
+     * 仅根据用户登录账号查询用户（不区分组织，SSO等场景使用）
+     */
+    public UserPo findByUserAccount(String userAccount) {
+        return userRepositoryInterface.findByUserAccount(userAccount);
+    }
+
     public UserPo getUserByDingUserId(String dingUserId) {
         return userRepositoryInterface.getUserByDingUserId(dingUserId);
     }

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java

@@ -500,6 +500,13 @@ public class UserAPI extends BaseController {
         return R.ok(sysUserVo, "操作成功");
     }
 
+    @ApiOperation("仅根据用户登录账号获取用户信息（不区分组织，SSO等场景）")
+    @GetMapping("/getUserByUserAccount")
+    public R<LoginUser> getUserByUserAccount(@RequestParam(value = "userAccount") String userAccount) {
+        LoginUser sysUserVo = userApplicationService.getUserByUserAccount(userAccount);
+        return R.ok(sysUserVo, "操作成功");
+    }
+
     @ApiOperation("根据用户钉钉用户id获取用户信息")
     @GetMapping("/getUserByDingUserId")
     public R<LoginUser> getUserByDingUserId(@RequestParam(value = "dingUserId") String dingUserId) {

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserShipperAPI.java

@@ -212,6 +212,15 @@ public class UserShipperAPI extends BaseController {
         return AjaxResult.success("操作成功",list);
     }
 
+    @Log(title = "托运人管理-查询租户下所有托运人", description ="查询租户下所有托运人",businessType = BusinessType.INQUIRE)
+    @ApiOperation("查询租户下所有托运人")
+    @GetMapping("/userShipperListAllByOrg")
+    public AjaxResult userShipperListAllByOrg(@RequestParam("orgCode") Long orgCode) {
+        //转换实体
+        List<UserShipperPo> list = userShipperApplicationService.userShipperListAllByOrg(orgCode);
+        return AjaxResult.success("操作成功",list);
+    }
+
     @Log(title = "托运人管理-修改授权额度 结算天数 使用额度", description ="修改授权额度 结算天数 使用额度",businessType = BusinessType.INQUIRE)
     @ApiOperation("修改授权额度和结算天数")
     @PutMapping("/settlementInfo")
@@ -352,8 +361,20 @@ public class UserShipperAPI extends BaseController {
     @PostMapping("/wxGetPhoneNumber")
     public AjaxResult wxGetPhoneNumber(@RequestBody com.mhd.user.interfaces.dto.wechat.WxPhoneNumberDTO dto) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long organizationId = (loginUser != null && loginUser.getUserPo() != null) 
+        Long organizationId = (loginUser != null && loginUser.getUserPo() != null)
                 ? loginUser.getUserPo().getOrganizationId() : null;
         return wechatMiniAppService.wxGetPhoneNumber(dto, organizationId);
     }
+
+    @Log(title = "托运人管理-导入", description = "从Excel导入委托方", businessType = BusinessType.IMPORT)
+    @ApiOperation("导入委托方（Excel批量）")
+    @PostMapping("/import")
+    public AjaxResult importShipper(@RequestParam("file") org.springframework.web.multipart.MultipartFile file) {
+        try {
+            return userShipperApplicationService.importShipperFromExcel(file);
+        } catch (Exception e) {
+            log.error("导入委托方失败", e);
+            return AjaxResult.error("导入失败：" + e.getMessage());
+        }
+    }
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/ShipperMasterDataSyncResultVo.java

@@ -18,6 +18,9 @@ public class ShipperMasterDataSyncResultVo {
     @ApiModelProperty("更新条数")
     private int updateCount;
 
+    @ApiModelProperty("关联到已存在委托方条数（按公司名跨组织匹配到同公司名委托方，仅在 orgCode 上追加新组织，不新增委托方）")
+    private int linkCount;
+
     @ApiModelProperty("跳过条数")
     private int skipCount;
 

mhd-user-center/src/main/resources/bootstrap.yml

@@ -20,15 +20,15 @@ spring:
       discovery:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.31:6848
+        server-addr: 10.33.0.129:6010
+#        server-addr: 10.102.192.30:6848
         username: nacos
         password: manhuoda@2023
       config:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.31:6848
+        server-addr: 10.33.0.129:6010
+#        server-addr: 10.102.192.30:6848
         username: nacos
         password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
@@ -42,4 +42,13 @@ spring:
       max-request-size: 50MB
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 10000
+        readTimeout: 120000
+      mhd-third-party-service:
+        connectTimeout: 10000
+        readTimeout: 120000

mhd-user-center/src/main/resources/mapper/UserMapper.xml

@@ -153,6 +153,13 @@
         </if>
         limit 1
     </select>
+    <!-- 仅根据用户登录账号查询用户（不区分组织，SSO等场景使用） -->
+    <select id="findByUserAccount" parameterType="java.lang.String"
+            resultType="com.mhd.common.core.domain.po.UserPo">
+        <include refid="selectUserVo"/>
+        and a.user_account = #{userAccount}
+        limit 1
+    </select>
     <!-- 根据用户钉钉userID查询用户 -->
     <select id="getUserByDingUserId" parameterType="java.lang.String"
             resultType="com.mhd.common.core.domain.po.UserPo">
@@ -775,10 +782,6 @@
         <if test="organizationId !=null">
             AND (
                 u.organization_id = #{organizationId}
-                OR b.org_code LIKE concat('%"code":"', #{organizationId}, '"%')
-                OR b.org_code LIKE concat('%code:', #{organizationId}, '%')
-                OR b.org_code LIKE concat('%code: ', #{organizationId}, '%')
-                OR b.org_code LIKE concat('%"code":', #{organizationId}, '%')
             )
             AND u.organization_name IS NOT NULL
         </if>

mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml

@@ -75,7 +75,9 @@
           AND b.del_flag = 1
     </sql>
     <sql id="selectShipperVo1">
-        SELECT b.shipper_id,
+        SELECT b.area,
+               b.detail_address,
+               b.shipper_id,
                a.user_id,
                b.parent_shipper_id,
                b.shipper_type,
@@ -379,10 +381,6 @@
         <if test="organizationId !=null">
             AND (
                 a.organization_id = #{organizationId}
-                OR b.org_code LIKE concat('%"code":"', #{organizationId}, '"%')
-                OR b.org_code LIKE concat('%code:', #{organizationId}, '%')
-                OR b.org_code LIKE concat('%code: ', #{organizationId}, '%')
-                OR b.org_code LIKE concat('%"code":', #{organizationId}, '%')
             )
         </if>
         /*组织名称*/
@@ -629,6 +627,22 @@
           AND a.organization_id = #{organizationId}
         LIMIT 1
     </select>
+
+    <!-- 按公司名跨组织查询第一个未删除的委托方（包含 orgCode），用于 MDM 同步时按"公司名"匹配已存在委托方 -->
+    <select id="findFirstByShipperEnterpriseNameAcrossOrgs" resultType="com.mhd.user.domain.userAggregate.entity.UserShipperEntity">
+        SELECT b.shipper_id,
+               b.user_id,
+               b.customer_nc_code,
+               b.data_source,
+               b.shipper_enterprise_name,
+               b.user_name_shipper,
+               b.org_code
+        FROM user_shipper b
+        WHERE b.del_flag = 1
+          AND b.shipper_enterprise_name = #{shipperEnterpriseName}
+        ORDER BY b.shipper_id ASC
+        LIMIT 1
+    </select>
     <select id="getOrgNcCode" resultType="java.lang.String">
         select NC_CODE from  NGWL_TEST_PRODUCT.SYS_ORGANIZATION where ORGANIZATION_ID = #{organizationId}
     </select>

mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java

@@ -7,6 +7,7 @@ import com.mhd.bms.application.server.receiptManage.ReceiptManageApplicationServ
 import com.mhd.bms.domain.billManage.entity.BillDetail;
 import com.mhd.bms.domain.billManage.entity.BillManage;
 import com.mhd.bms.domain.billManage.repository.facade.IBillDetailService;
+import com.mhd.bms.domain.billManage.repository.facade.IBillManageService;
 import com.mhd.bms.domain.billManage.repository.mapper.BillDetailMapper;
 import com.mhd.bms.domain.billManage.repository.po.BillDetailPO;
 import com.mhd.bms.domain.billManage.repository.po.BillManagePO;
@@ -18,6 +19,7 @@ import com.mhd.bms.domain.billOperationLog.repository.todo.BillOperationLogDO;
 import com.mhd.bms.domain.billOperationLog.service.BillOperationLogDomainService;
 import com.mhd.bms.domain.billingStatement.entity.BillingStatement;
 import com.mhd.bms.domain.billingStatement.repository.po.BillingStatementPO;
+import com.mhd.bms.domain.billingStatement.repository.todo.BillingStatementDO;
 import com.mhd.bms.domain.billingStatement.service.BillingStatementDomainService;
 import com.mhd.bms.domain.ncLog.entity.NcLog;
 import com.mhd.bms.domain.ncLog.repository.mapper.NcLogMapper;
@@ -77,6 +79,8 @@ public class BillManageApplicationService {
     private BillDetailMapper billDetailMapper;
     @Autowired
     private NcLogMapper ncLogMapper;
+    @Autowired
+    private IBillManageService billManageService;
 
 
     /**
@@ -132,8 +136,12 @@ public class BillManageApplicationService {
         List<BillManagePO> billManagePOS = billManageDomainService.queryList(billManageDO);
         for (BillManagePO billManagePO : billManagePOS) {
             String billNumber = billManagePO.getBillNumber(); // 获取账单编号
+            // 原有 - 前端列表用，不变
             List<BillDetail> billDetails = billDetailMapper.selectList(new LambdaQueryWrapper<BillDetail>().eq(BillDetail::getBillNumber, billNumber));
             billManagePO.setBillDetailList(billDetails);
+            // 新增 - 导出用，LEFT JOIN billing_statement 拿到费用科目
+            List<BillDetailPO> billDetailPOs = billDetailMapper.getDetailsByBillManageId(billManagePO.getBillManageId());
+            billManagePO.setBillDetailPOList(billDetailPOs);
         }
         return billManagePOS;
     }
@@ -333,7 +341,10 @@ public class BillManageApplicationService {
         BigDecimal billingDiscountAmount = billDetailDTOList.stream().map(BillDetailDTO::getBillingDiscountAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
         //比较传来的账单总额、账单金额、账单优惠金额与计算的是否一致，不一致则报错
         if(billingTotalAmount.compareTo(billManageDTO.getBillTotalAmount())!=0 || billingAmount.compareTo(billManageDTO.getBillAmount())!=0 || billingDiscountAmount.compareTo(billManageDTO.getBillDiscountAmount())!=0){
-            throw new ServiceException("账单金额不一致，调整失败，请重试");
+            // 金额不一致时，用明细累加值覆盖前端传值，不再抛异常
+            billManageDTO.setBillTotalAmount(billingTotalAmount);
+            billManageDTO.setBillAmount(billingAmount);
+            billManageDTO.setBillDiscountAmount(billingDiscountAmount);
         }
         //将集合中没有计费流水id的过滤到另一个集合，将添加费用的集合保存到计费流水并返回计费流水id
         List<BillDetailDTO> billDetailDTOListNoBillingStatementId = billDetailDTOList.stream().filter(billDetailDTO -> billDetailDTO.getBillingStatementId()==null).collect(Collectors.toList());
@@ -356,6 +367,19 @@ public class BillManageApplicationService {
                 billDetailDTO1.setFeeType(billDetailDTO1.getServiceItemsName());
             });
         }
+        //同步更新已有计费流水（调整账单时可修改已有费用）
+        List<BillDetailDTO> billDetailDTOListHasBillingStatementId = billDetailDTOList.stream()
+                .filter(billDetailDTO -> billDetailDTO.getBillingStatementId() != null)
+                .collect(Collectors.toList());
+        for (BillDetailDTO billDetailDTO : billDetailDTOListHasBillingStatementId) {
+            BillingStatementDO billingStatementDO = new BillingStatementDO();
+            BeanUtils.copyProperties(billDetailDTO, billingStatementDO);
+            billingStatementDO.setBillingStatementId(billDetailDTO.getBillingStatementId());
+            billingStatementDO.setBillManageId(billManagePO.getBillManageId());
+            billingStatementDO.setBillingState(3);
+            billingStatementDO.setAccountExpenseType(billDetailDTO.getBillType());
+            billingStatementApplicationService.update(billingStatementDO);
+        }
         //保存账单明细
         Boolean flag = billDetailDomainService.saveBatch(billDetailDTOList);
         //更新账单金额
@@ -369,7 +393,10 @@ public class BillManageApplicationService {
         billManageDO.setTailCalculationCode(billManageDTO.getTailCalculationCode());
         billManageDO.setAmountAccuracyCode(billManageDTO.getAmountAccuracyCode());
         billManageDO.setBillDiscount(billManageDTO.getBillDiscount());
+        billManageDO.setBillRemark(billManageDTO.getBillRemark());
         billManageDO.setBillDiscountLimit(billManageDTO.getBillDiscountLimit());
+        billManageDO.setCycleBeginTime(billManageDTO.getCycleBeginTime());
+        billManageDO.setCycleEndTime(billManageDTO.getCycleEndTime());
         billManageDO.setCreateTime(billManageDTO.getCreateTime());
         billManageDO.setUpdateTime(new Date());
         billManageDO.setUpdateBy(loginUser.getUserid());
@@ -386,83 +413,185 @@ public class BillManageApplicationService {
     }
 
     /**
-     * 复制账单
+     * 新增账单
      */
     @Transactional
-    public Boolean copyBill(BillManageDTO billManageDTO) {
+    public Boolean addBill(BillManageDTO billManageDTO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
+        if (billManageDTO.getBillDetailDTOList() == null || billManageDTO.getBillDetailDTOList().size() == 0) {
+            throw new ServiceException("账单明细不能为空");
+        }
+        List<BillDetailDTO> billDetailDTOList = billManageDTO.getBillDetailDTOList();
+        //计算集合中所有账单总额、账单金额、账单优惠金额
+        BigDecimal billingTotalAmount = billDetailDTOList.stream().map(BillDetailDTO::getBillingTotalAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal billingAmount = billDetailDTOList.stream().map(BillDetailDTO::getBillingAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal billingDiscountAmount = billDetailDTOList.stream().map(BillDetailDTO::getBillingDiscountAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        //生成账单编号
+        String billNumber = OrderSequence.getOrderCode("ZD");
+        //创建账单主记录
+        BillManageDO billManageDO = new BillManageDO();
+        BeanUtils.copyProperties(billManageDTO, billManageDO);
+        billManageDO.setBillNumber(billNumber);
+        billManageDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        billManageDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+        billManageDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+        billManageDO.setBillAmount(billingAmount);
+        billManageDO.setBillAmountUnsettled(billingAmount);
+        billManageDO.setBillAmountSettlement(BigDecimal.ZERO);
+        billManageDO.setBillDiscountAmount(billingDiscountAmount);
+        billManageDO.setBillTotalAmount(billingTotalAmount);
+        billManageDO.setBillState(1);
+        billManageDO.setBillStep(1);
+        billManageDO.setReconciliationStatus(1);
+        billManageDO.setCreateTime(new Date());
+        billManageDO.setCreateBy(loginUser.getUserid());
+        billManageDO.setSalesmanId(String.valueOf(loginUser.getUserid()));
+        billManageDO.setCreateByName(loginUser.getUserPo().getUserName());
+        billManageDO.setUpdateTime(new Date());
+        billManageDO.setUpdateBy(loginUser.getUserid());
+        billManageDO.setUpdateByName(loginUser.getUserPo().getUserName());
+        billManageDomainService.handlData(billManageDO);
+        Boolean flag = billManageDomainService.insert(billManageDO);
+        if (!flag) {
+            throw new ServiceException("新增账单失败");
+        }
+        // insert后按账单编号重新查一次拿自增ID
+        List<BillManage> insertedList = billManageDomainService.queryListLambda(
+                new LambdaQueryWrapper<BillManage>().eq(BillManage::getBillNumber, billNumber));
+        if (insertedList != null && !insertedList.isEmpty()) {
+            billManageDO.setBillManageId(insertedList.get(0).getBillManageId());
+        }
+        //将集合中没有计费流水id的过滤到另一个集合，将添加费用的集合保存到计费流水并返回计费流水id
+        List<BillDetailDTO> billDetailDTOListNoBillingStatementId = billDetailDTOList.stream().filter(item -> item.getBillingStatementId() == null).collect(Collectors.toList());
+        //遍历集合并保存流水
+        for (BillDetailDTO billDetailDTO : billDetailDTOListNoBillingStatementId) {
+            BillingStatementDTO billingStatementDTO = new BillingStatementDTO();
+            BeanUtils.copyProperties(billDetailDTO, billingStatementDTO);
+
+            String firstSubjectCode = billDetailDTO.getFirstSubjectCode();
+            Double taxRate = billDetailMapper.getTaxRate(firstSubjectCode);
+            BigDecimal amount = billingStatementDTO.getBillingAmount();
+            BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))),10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal taxFreeFee = amount.subtract(taxAmount);
+            billingStatementDTO.setTaxAmount(taxAmount);
+            billingStatementDTO.setTaxFreeFee(taxFreeFee);
+            billingStatementDTO.setTaxRate(taxRate);
+            billingStatementDTO.setBillingAmount(amount);
+            billingStatementDTO.setAccountExpenseType(billDetailDTO.getBillType());
+            billingStatementDTO.setBillManageId(billManageDO.getBillManageId());
+            billingStatementDTO.setBillingState(3);
+            Long billingStatementId = billingStatementApplicationService.insertAndReturnId(billingStatementDTO);
+            //遍历billDetailDTOList集合，将计费流水号相同的，赋值计费流水id
+            billDetailDTOList.stream().filter(item -> item.getBillingFlow().equals(billDetailDTO.getBillingFlow())).forEach(item -> {
+                item.setBillingStatementId(billingStatementId);
+                item.setBillType(billManageDTO.getBillType());
+                item.setBillManageId(billManageDO.getBillManageId());
+                item.setBillNumber(billNumber);
+                item.setInvoiceItem(item.getFirstSubjectCode());
+                item.setInvoiceItemName(item.getFirstSubjectName());
+                item.setFeeType(item.getServiceItemsName());
+            });
+        }
+        //同步更新已有计费流水（新增账单时可修改已有费用）
+        List<BillDetailDTO> billDetailDTOListHasBillingStatementId = billDetailDTOList.stream()
+                .filter(item -> item.getBillingStatementId() != null)
+                .collect(Collectors.toList());
+        for (BillDetailDTO billDetailDTO : billDetailDTOListHasBillingStatementId) {
+            BillingStatementDO billingStatementDO = new BillingStatementDO();
+            BeanUtils.copyProperties(billDetailDTO, billingStatementDO);
+            billingStatementDO.setBillingStatementId(billDetailDTO.getBillingStatementId());
+            billingStatementDO.setBillManageId(billManageDO.getBillManageId());
+            billingStatementDO.setBillingState(3);
+            billingStatementDO.setAccountExpenseType(billDetailDTO.getBillType());
+            billingStatementApplicationService.update(billingStatementDO);
+        }
+        //保存账单明细
+        double allTaxRate = 0.0d;
+        BigDecimal allTaxAmount = BigDecimal.ZERO;
+        BigDecimal allTaxFreeFee = BigDecimal.ZERO;
+        for (BillDetailDTO item : billDetailDTOList) {
+            String firstSubjectCode = item.getFirstSubjectCode();
+            Double taxRate = billDetailMapper.getTaxRate(firstSubjectCode);
+            BigDecimal amount = item.getBillingAmount();
+            BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))),10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal taxFreeFee = amount.subtract(taxAmount);
+            item.setTaxAmount(taxAmount);
+            item.setTaxFreeFee(taxFreeFee);
+            item.setTaxRate(taxRate);
+            item.setBillManageId(billManageDO.getBillManageId());
+            item.setBillNumber(billManageDO.getBillNumber());
+            allTaxRate += taxRate;
+            allTaxAmount = allTaxAmount.add(taxAmount);
+            allTaxFreeFee = allTaxFreeFee.add(taxFreeFee);
+        }
+
+        BillManage billManage = billManageService.getById(billManageDO.getBillManageId());
+        if (billManage != null) {
+            billManage.setTaxRate(allTaxRate);
+            billManage.setTaxAmount(allTaxAmount);
+            billManage.setTaxFreeFee(allTaxFreeFee);
+            billManage.setSalesmanId(String.valueOf(loginUser.getUserid()));
+            billManageService.updateById(billManage);
+        }
+        Boolean flagTwo = billDetailDomainService.saveBatch(billDetailDTOList);
+        //保存操作记录
+        BillOperationLogDO billOperationLogDO = new BillOperationLogDO();
+        billOperationLogDO.setBillManageId(billManageDO.getBillManageId());
+        billOperationLogDO.setOperationInfo(StringUtils.format(BillLogsConstants.create_bill_text, billNumber, billingAmount));
+        billOperationLogDO.setOperationType(1);
+        boolean flagThree = billOperationLogDomainService.saveBillOperationLog(billOperationLogDO);
+        return flag && flagTwo && flagThree;
+    }
+
+    /**
+     * 复制账单-获取原账单数据供前端回显
+     * 前端拿到数据后跳转到类似修改/新增账单的页面，用户修改后通过addBill接口提交新增
+     */
+    public BillManagePO copyBill(BillManageDTO billManageDTO) {
         if (billManageDTO.getBillManageId() == null) {
             throw new ServiceException("原账单id不能为空");
         }
-        // 1. 获取原账单信息
+        // 获取原账单信息
         BillManagePO originalBill = billManageDomainService.getInfo(billManageDTO.getBillManageId());
         if (null == originalBill) {
             throw new ServiceException("原账单信息未找到");
         }
-        // 2. 获取原账单明细
+        // 获取原账单明细
         List<BillDetailPO> originalDetails = billDetailDomainService.getDetailsByBillManageId(billManageDTO.getBillManageId());
         if (originalDetails == null || originalDetails.isEmpty()) {
             throw new ServiceException("原账单明细为空，无法复制");
         }
-        // 3. 创建新账单，除账单编号外完全复制原账单
-        String newBillNumber = OrderSequence.getOrderCode("ZD");
-        BillManage newBill = new BillManage();
-        BeanUtils.copyProperties(originalBill, newBill);
-        newBill.setBillManageId(null);
-        newBill.setBillNumber(newBillNumber);
-        newBill.setCreateBy(loginUser.getUserPo().getUserId());
-        newBill.setCreateByName(loginUser.getUserPo().getUserName());
-        newBill.setCreateTime(new Date());
-        newBill.setUpdateBy(loginUser.getUserPo().getUserId());
-        newBill.setUpdateByName(loginUser.getUserPo().getUserName());
-        newBill.setUpdateTime(new Date());
-        newBill.setDelFlag(1);
-        // 保存新账单
-        boolean flag = billManageDomainService.saveEntity(newBill);
-        if (!flag) {
-            throw new ServiceException("复制账单失败，请重试");
+        // 重置关键字段为初始值，清空id等，方便前端回显后直接提交新增
+        originalBill.setBillManageId(null);
+        originalBill.setBillNumber(null);
+        originalBill.setBillState(1);
+        originalBill.setBillStep(1);
+        originalBill.setReconciliationStatus(0);
+        originalBill.setIsInvoice(0);
+        originalBill.setActualReceivedAmount(BigDecimal.ZERO);
+        originalBill.setBillAmountUnsettled(originalBill.getBillAmount());
+        originalBill.setBillAmountSettlement(BigDecimal.ZERO);
+        originalBill.setSynchronousStatus(0);
+        originalBill.setSkSynchronousStatus(0);
+        originalBill.setApplyNumber(null);
+        originalBill.setSettlementTime(null);
+        originalBill.setSynchronousTime(null);
+        originalBill.setSkSynchronousTime(null);
+        originalBill.setInvoiceId(null);
+        originalBill.setInvoiceMakeTime(null);
+        originalBill.setNcId(null);
+        originalBill.setSkNcId(null);
+        // 明细也清空id
+        for (BillDetailPO detail : originalDetails) {
+            detail.setBillDetailId(null);
+            detail.setBillManageId(null);
+            detail.setBillNumber(null);
         }
-        // 4. 复制账单明细
-        List<BillDetail> newDetailList = new ArrayList<>();
-        for (BillDetailPO originalDetail : originalDetails) {
-            BillDetail newDetail = new BillDetail();
-            BeanUtils.copyProperties(originalDetail, newDetail);
-            newDetail.setBillDetailId(null);
-            newDetail.setBillManageId(newBill.getBillManageId());
-            newDetail.setBillNumber(newBillNumber);
-            newDetail.setCreateBy(loginUser.getUserPo().getUserId());
-            newDetail.setCreateByName(loginUser.getUserPo().getUserName());
-            newDetail.setCreateTime(new Date());
-            newDetailList.add(newDetail);
-        }
-        Boolean flagTwo = billDetailDomainService.insertBatch(newDetailList);
-        // 5. 复制计费流水（billing_statement）
-        List<BillingStatementPO> originalStatements = billingStatementDomainService.getDetailsByManageId(billManageDTO.getBillManageId());
-        boolean flagThree = true;
-        if (originalStatements != null && !originalStatements.isEmpty()) {
-            List<BillingStatement> newStatementList = new ArrayList<>();
-            for (BillingStatementPO originalStatement : originalStatements) {
-                BillingStatement newStatement = new BillingStatement();
-                BeanUtils.copyProperties(originalStatement, newStatement);
-                newStatement.setBillingStatementId(null);
-                newStatement.setBillManageId(newBill.getBillManageId());
-                newStatement.setCreateBy(loginUser.getUserPo().getUserId());
-                newStatement.setCreateByName(loginUser.getUserPo().getUserName());
-                newStatement.setCreateTime(new Date());
-                newStatementList.add(newStatement);
-            }
-            flagThree = billingStatementDomainService.saveEntityBatch(newStatementList);
-        }
-        // 6. 保存操作日志
-        BillOperationLogDO billOperationLogDO = new BillOperationLogDO();
-        billOperationLogDO.setBillManageId(newBill.getBillManageId());
-        billOperationLogDO.setOperationInfo(StringUtils.format(BillLogsConstants.copy_bill_text, originalBill.getBillNumber(), newBillNumber));
-        billOperationLogDO.setOperationType(1);
-        boolean three = billOperationLogDomainService.saveBillOperationLog(billOperationLogDO);
-        return flag && flagTwo && flagThree && three;
+        originalBill.setBillDetailPOList(originalDetails);
+        return originalBill;
     }
 
     /**
@@ -644,6 +773,76 @@ public class BillManageApplicationService {
         return billManageDomainService.synchronousNcSK(businessDocumentDetaliIds);
     }
 
+    /**
+     * 修改账单明细
+     */
+    @Transactional
+    public Boolean updateBillDetail(BillManageDTO billManageDTO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+        BillDetailDTO detailDTO = billManageDTO.getBillDetailDTOList() != null && !billManageDTO.getBillDetailDTOList().isEmpty()
+                ? billManageDTO.getBillDetailDTOList().get(0) : null;
+        if (detailDTO == null || detailDTO.getBillDetailId() == null) {
+            throw new ServiceException("明细id不能为空");
+        }
+        BillDetailPO billDetailPO = billDetailDomainService.getInfo(detailDTO.getBillDetailId());
+        if (billDetailPO == null) {
+            throw new ServiceException("明细不存在");
+        }
+        BillManagePO billManagePO = billManageDomainService.getInfo(billDetailPO.getBillManageId());
+        if (billManagePO == null || billManagePO.getBillState() != 1) {
+            throw new ServiceException("账单状态不为未确认，不可修改明细");
+        }
+        BillDetailDO billDetailDO = new BillDetailDO();
+        BeanUtils.copyProperties(detailDTO, billDetailDO);
+        billDetailDO.setBillDetailId(detailDTO.getBillDetailId());
+        billDetailDO.setInvoiceItem(detailDTO.getFirstSubjectCode());
+        billDetailDO.setInvoiceItemName(detailDTO.getFirstSubjectName());
+        billDetailDO.setFeeType(detailDTO.getServiceItemsName());
+        billDetailDO.setUpdateBy(loginUser.getUserid());
+        billDetailDO.setUpdateByName(loginUser.getUserPo().getUserName());
+        billDetailDO.setUpdateTime(new Date());
+        // 同步更新计费流水的费用科目、服务项（因为这些字段在 billing_statement 表，不在 bill_detail 表）
+        if (billDetailPO.getBillingStatementId() != null) {
+            BillingStatementDO billingStatementDO = new BillingStatementDO();
+            billingStatementDO.setBillingStatementId(billDetailPO.getBillingStatementId());
+            billingStatementDO.setFirstSubjectCode(detailDTO.getFirstSubjectCode());
+            billingStatementDO.setFirstSubjectName(detailDTO.getFirstSubjectName());
+            billingStatementDO.setServiceItemsCode(detailDTO.getServiceItemsCode());
+            billingStatementDO.setServiceItemsName(detailDTO.getServiceItemsName());
+            billingStatementDO.setUpdateBy(loginUser.getUserid());
+            billingStatementDO.setUpdateByName(loginUser.getUserPo().getUserName());
+            billingStatementDO.setUpdateTime(new Date());
+            billingStatementApplicationService.update(billingStatementDO);
+        }
+        Boolean flag = billDetailDomainService.update(billDetailDO);
+        // 重新计算账单总金额并更新主表
+        List<BillDetailPO> allDetails = billDetailDomainService.getDetailsByBillManageId(billManagePO.getBillManageId());
+        allDetails = allDetails.stream().map(item -> {
+            if (item.getBillDetailId().equals(detailDTO.getBillDetailId())) {
+                item.setBillingTotalAmount(detailDTO.getBillingTotalAmount());
+                item.setBillingAmount(detailDTO.getBillingAmount());
+                item.setBillingDiscountAmount(detailDTO.getBillingDiscountAmount());
+            }
+            return item;
+        }).collect(Collectors.toList());
+        BigDecimal totalAmount = allDetails.stream().map(BillDetailPO::getBillingTotalAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal amount = allDetails.stream().map(BillDetailPO::getBillingAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal discountAmount = allDetails.stream().map(BillDetailPO::getBillingDiscountAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BillManageDO billManageDO = new BillManageDO();
+        billManageDO.setBillManageId(billManagePO.getBillManageId());
+        billManageDO.setBillTotalAmount(totalAmount);
+        billManageDO.setBillAmount(amount);
+        billManageDO.setBillAmountUnsettled(amount);
+        billManageDO.setBillDiscountAmount(discountAmount);
+        billManageDO.setUpdateBy(loginUser.getUserid());
+        billManageDO.setUpdateByName(loginUser.getUserPo().getUserName());
+        billManageDO.setUpdateTime(new Date());
+        Boolean flagTwo = billManageDomainService.update(billManageDO);
+        return flag && flagTwo;
+    }
 
 
 }

mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java

@@ -585,6 +585,8 @@ public class BillingStatementApplicationService {
             此方法只进行实体返回，并不进行数据保存
          */
         LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        billingStatementDO.setAccountExpenseType(billingStatementDO.getAccountExpenseType());
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
@@ -594,10 +596,16 @@ public class BillingStatementApplicationService {
         BeanUtils.copyProperties(billingStatementDO,billingStatementPO);
         billingStatementPO.setBillingTotalAmount(billingStatementDO.getBillingAmount());
         billingStatementPO.setDataSources(2);
-        billingStatementPO.setBillingFlow(OrderSequence.getOrderCode("JFLS"));
+        // 若传入了计费流水号，则直接使用；否则自动生成
+        if (StringUtils.isEmpty(billingStatementPO.getBillingFlow())) {
+            billingStatementPO.setBillingFlow(OrderSequence.getOrderCode("JFLS"));
+        }
         billingStatementPO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
         billingStatementPO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
         billingStatementPO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+        // 默认填充当前登录人为业务员
+        billingStatementPO.setSalesmanId(String.valueOf(loginUser.getUserid()));
+        billingStatementPO.setSalesmanName(loginUser.getUserPo().getUserName());
         return billingStatementPO;
     }
 

mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java

@@ -288,6 +288,9 @@ public class BusinessDocumentApplicationService {
             billingStatementDTO.setBillingStatementIds(billingStatement.getBillingStatementId().toString());
             billingStatementDTO.setAuditOperation(1);
             billingStatementDomainService.reviewBilling(billingStatementDTO);
+            billingStatement.setBillManageId(businessDocumentDO.getBillManageId());
+            billingStatement.setBillingState(3);
+            billingStatementMapper.updateById(billingStatement);
         }
 
         BillManage billManage = billManageService.getById(businessDocumentDO.getBillManageId());
@@ -320,6 +323,14 @@ public class BusinessDocumentApplicationService {
         BigDecimal amount = billAmount.add(billDetail.getBillingAmount());
         billManage.setBillAmount(amount);
         billManage.setBillTotalAmount(amount);
+        BigDecimal billTotalAmount = billManage.getBillTotalAmount();
+        BigDecimal billAmountSettlement = billManage.getBillAmountSettlement();
+        BigDecimal subtract = billTotalAmount.subtract(billAmountSettlement);
+        billManage.setBillAmountUnsettled(subtract);
+        BigDecimal taxAmount = billManage.getTaxAmount();
+        billManage.setTaxAmount(taxAmount.add(billDetail.getTaxAmount()));
+        BigDecimal taxFreeFee = billManage.getTaxFreeFee();
+        billManage.setTaxFreeFee(taxFreeFee.add(billDetail.getTaxFreeFee()));
         billManageService.updateById(billManage);
         return true;
     }
@@ -607,7 +618,7 @@ public class BusinessDocumentApplicationService {
         if(businessDocumentDO.getBelongModuleCode().equals(BelongModuleCode.WMS.getCode())){
             contractType = 1;
         }
-        AjaxResult ajaxResult = systemServiceFeign.getInfoByCustomerAndSecondSubjectCode(businessDocumentDO.getSettlementCustomersCode(),contractType,businessDocumentDO.getFirstSubjectCode(),businessDocumentDO.getTopOrganizationId(),businessDocumentDO.getOrganizationId());
+        AjaxResult ajaxResult = systemServiceFeign.getInfoByCustomerAndSecondSubjectCode(businessDocumentDO.getSettlementCustomersCode(),contractType,businessDocumentDO.getFirstSubjectCode() != null ?businessDocumentDO.getFirstSubjectCode():businessDocumentDO.getSecondSubjectCode(),businessDocumentDO.getTopOrganizationId(),businessDocumentDO.getOrganizationId());
         if(!"200".equals(String.valueOf(ajaxResult.get("code")))) {
             throw new ServiceException("合同信息未找到");
         }
@@ -615,6 +626,10 @@ public class BusinessDocumentApplicationService {
         if (null == contractPO) {
             throw new ServiceException("合同信息未找到");
         }
+        String isMany = contractPO.getIsMany();
+        if ("1".equals(isMany)) {
+            throw new ServiceException("存在多条相同费用科目的合同，请检查");
+        }
         businessDocumentDO.setContractName(contractPO.getContractName());
         businessDocumentDO.setContractNumber(contractPO.getContractNumber());
     }

mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java

@@ -274,7 +274,7 @@ public class SettlementCustomersApplicationService {
                                                 SyncDictCache dictCache,
                                                 List<SettlementCustomers> toInsert,
                                                 List<SettlementCustomers> toUpdate) {
-        AjaxResult ajaxResult = userServiceFeign.userShipperListAll();
+        AjaxResult ajaxResult = userServiceFeign.userShipperListAllByOrg(loginUser.getUserPo().getOrganizationId());
         List<UserShipperPo> userShipperPoList = parseFeignList(ajaxResult, UserShipperPo.class);
         if (userShipperPoList.isEmpty()) {
             return;

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/facade/IBillDetailService.java

@@ -38,4 +38,6 @@ public interface IBillDetailService extends IService<BillDetail>
     public BillDetailPO getInfo(Long billDetailId);
 
     List<BillDetailPO> getDetailsByBillManageId(Long billManageId);
-}
+
+    List<BillDetail> getDetailsByBillManageIdAndGroup(Long billManageId);
+}

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillDetailMapper.java

@@ -5,6 +5,7 @@ import com.mhd.bms.domain.billManage.entity.BillDetail;
 import com.mhd.bms.domain.billManage.repository.po.BillDetailPO;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -17,4 +18,8 @@ public interface BillDetailMapper extends BaseMapper<BillDetail>
 {
 
     List<BillDetailPO> getDetailsByBillManageId(@Param("billManageId") Long billManageId);
-}
+
+    List<BillDetail> getDetailsByBillManageIdAndGroup(@Param("billManageId") Long billManageId);
+
+    Double getTaxRate(@Param("code") String code);
+}

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java

@@ -44,4 +44,6 @@ public interface BillManageMapper extends BaseMapper<BillManage>
     String getDeptName(@Param("dictCode") String dictCode);
 
     String getOrgCodeNc(@Param("organizationId") Long organizationId);
+
+    Long getShipperId(@Param("userId") Long userId, @Param("organizationId") Long organizationId);
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillDetailImpl.java

@@ -75,4 +75,9 @@ public class BillDetailImpl extends ServiceImpl<BillDetailMapper, BillDetail> im
     public List<BillDetailPO> getDetailsByBillManageId(Long billManageId) {
         return billDetailMapper.getDetailsByBillManageId(billManageId);
     }
-}
+
+    @Override
+    public List<BillDetail> getDetailsByBillManageIdAndGroup(Long billManageId) {
+        return billDetailMapper.getDetailsByBillManageIdAndGroup(billManageId);
+    }
+}

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java

@@ -264,4 +264,6 @@ public class BillManageDO extends BaseVOEntity{
     private String paymentAccountId;
     @ApiModelProperty("收款帐户名称")
     private String paymentAccountName;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java

@@ -100,6 +100,10 @@ public class BillingStatementPO extends BaseVOEntity{
     @Excel(name = "收支类型", readConverterExp = "1=-应收，2-应付")
     private Integer accountExpenseType;
 
+    @ApiModelProperty("收支类型（1-应收，2-应付）")
+    @Excel(name = "收支类型", readConverterExp = "1=-应收，2-应付")
+    private Integer billType;
+
     @ApiModelProperty("流水备注")
     @Excel(name = "流水备注")
     private String billingRemark;

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java

@@ -101,6 +101,10 @@ public class BillingStatementDO extends BaseVOEntity{
     @Excel(name = "收支类型", readConverterExp = "1=-应收，2-应付")
     private Integer accountExpenseType;
 
+    @ApiModelProperty("收支类型（1-应收，2-应付）")
+    @Excel(name = "收支类型", readConverterExp = "1=-应收，2-应付")
+    private Integer billType;
+
     @ApiModelProperty("流水备注")
     @Excel(name = "流水备注")
     private String billingRemark;

mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/service/BillingStatementDomainService.java

@@ -675,6 +675,9 @@ public class BillingStatementDomainService {
      */
     public List<BillingStatementPO> getBillDetailsList(BillingStatementDO billingStatementDO) {
         //查询当前账单的五大信息：组织信息、结算对象、来源系统、收支类型、账单周期
+        if (billingStatementDO.getBillManageId() == null || billingStatementDO.getBillManageId() <= 0) {
+            return new ArrayList<>();
+        }
         BillManagePO billManagePO = billManageDomainService.getInfo(billingStatementDO.getBillManageId());
         if(null == billManagePO){
             throw new ServiceException("账单信息未找到");

mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mhd.bms.domain.billManage.entity.BillManage;
 import com.mhd.bms.domain.billManage.repository.mapper.BillManageMapper;
+import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.bms.domain.bmsInvoiceList.entity.BmsInvoiceList;
 import com.mhd.bms.domain.bmsInvoiceList.entity.BmsSettlementPartyInvoice;
 import com.mhd.bms.domain.bmsInvoiceList.repository.facade.IBmsInvoiceListService;
@@ -56,6 +57,8 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
     private BmsMakeOutInvoiceItemMapper bmsMakeOutInvoiceItemMapper;
     @Resource
     private BillManageMapper billManageMapper;
+    @Resource
+    private com.mhd.system.api.SystemServiceFeign systemServiceFeign;
     /*@Resource
     private BmsSettlementPartyInvoiceMapper bmsSettlementPartyInvoiceMapper;*/
 
@@ -327,7 +330,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
     /**
      * 发票详情
      *
-     * @param id
+     * @param
      * @return
      */
     @Override
@@ -415,6 +418,23 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
                     bmsMakeOutInvoiceItem.setMakeId(bmsMakeOutInvoice.getId());
                     //bmsMakeOutInvoiceItem.setCreateBy(sysUser.getId());
                     bmsMakeOutInvoiceItem.setCreateTime(date);
+                    // 如果前端没传 invoiceItemName，按 invoiceItem（编码）从费用科目反查名称补齐
+                    if (StringUtils.isEmpty(bmsMakeOutInvoiceItem.getInvoiceItemName())
+                            && StringUtils.isNotEmpty(bmsMakeOutInvoiceItem.getInvoiceItem())) {
+                        try {
+                            AjaxResult ajaxResult = systemServiceFeign.getSubInfoByCode(bmsMakeOutInvoiceItem.getInvoiceItem());
+                            if ("200".equals(String.valueOf(ajaxResult.get("code"))) && ajaxResult.get("data") != null) {
+                                com.alibaba.fastjson.JSONObject dataObj = com.alibaba.fastjson.JSON.parseObject(
+                                        com.alibaba.fastjson.JSON.toJSONString(ajaxResult.get("data")));
+                                String subjectName = dataObj.getString("subjectName");
+                                if (StringUtils.isNotEmpty(subjectName)) {
+                                    bmsMakeOutInvoiceItem.setInvoiceItemName(subjectName);
+                                }
+                            }
+                        } catch (Exception e) {
+                            log.warn("开票项目名称反查失败 invoiceItem=" + bmsMakeOutInvoiceItem.getInvoiceItem() + " " + e.getMessage());
+                        }
+                    }
                     bmsMakeOutInvoiceItemMapper.insert(bmsMakeOutInvoiceItem);
                 }
             }

mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManagePO.java

@@ -169,4 +169,6 @@ public class ContractManagePO extends BaseVOEntity{
     @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)")
     private Integer principalType;
 
+    private String isMany;
+
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageExportVO.java

@@ -0,0 +1,145 @@
+package com.mhd.bms.interfaces.dto.billManage;
+
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "应收账单导出对象")
+public class BillManageExportVO {
+
+    /** ====== 原有账单头字段（与 BillManagePO 的 @Excel 一致） ====== */
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @Excel(name = "账单编号")
+    private String billNumber;
+
+    @Excel(name = "账单类型", readConverterExp = "1=-应收，2-应付")
+    private Integer billType;
+
+    @Excel(name = "账单状态", readConverterExp = "1=-未确认，2-对账中，3-未收款/付款，4-部分收款/付款，5-已收款/付款，6-已作废,7-已退款")
+    private Integer billState;
+
+    @Excel(name = "账单流程节点", readConverterExp = "1=-发起对账，2-客户确认，3-财务审核，4-收款/付款")
+    private Integer billStep;
+
+    @Excel(name = "系统来源")
+    private String belongModule;
+
+    @Excel(name = "系统来源code")
+    private String belongModuleCode;
+
+    @Excel(name = "结算对象id")
+    private Long settlementCustomersId;
+
+    @Excel(name = "结算对象code")
+    private String settlementCustomersCode;
+
+    @Excel(name = "结算对象")
+    private String settlementEntity;
+
+    @Excel(name = "账单总金额")
+    private BigDecimal billTotalAmount;
+
+    @Excel(name = "优惠金额")
+    private BigDecimal billDiscountAmount;
+
+    @Excel(name = "账单金额")
+    private BigDecimal billAmount;
+
+    @Excel(name = "已收/付金额")
+    private BigDecimal billAmountSettlement;
+
+    @Excel(name = "未收/付金额")
+    private BigDecimal billAmountUnsettled;
+
+    @Excel(name = "期望金额")
+    private BigDecimal billExpectedAmount;
+
+    @Excel(name = "对账状态", readConverterExp = "1=-暂未确认，2-申请调账，3-财务调账，4-核对无误")
+    private Integer reconciliationStatus;
+
+    @Excel(name = "对账意见描述")
+    private String reconciliationOpinion;
+
+    @Excel(name = "客户凭证地址")
+    private String voucherAddress;
+
+    @Excel(name = "财务审核结果(1-同意，2-拒绝)")
+    private Integer financialReviewFlag;
+
+    @Excel(name = "审核意见描述")
+    private String financialReviewOpinion;
+
+    @Excel(name = "周期开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date cycleBeginTime;
+
+    @Excel(name = "周期结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date cycleEndTime;
+
+    @Excel(name = "收款/付款时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date settlementTime;
+
+    @Excel(name = "备注")
+    private String billRemark;
+
+    @Excel(name = "折扣百分比")
+    private BigDecimal billDiscount;
+
+    @Excel(name = "折扣上限金额")
+    private BigDecimal billDiscountLimit;
+
+    @Excel(name = "费用计算精度code")
+    private String costAccuracyCode;
+
+    @Excel(name = "费用计算精度name")
+    private String costAccuracyName;
+
+    @Excel(name = "尾数计算code")
+    private String tailCalculationCode;
+
+    @Excel(name = "尾数计算name")
+    private String tailCalculationName;
+
+    @Excel(name = "账单金额精度code")
+    private String amountAccuracyCode;
+
+    @Excel(name = "账单金额精度name")
+    private String amountAccuracyName;
+
+    /** ====== 新增明细字段（来源于 bill_detail + billing_statement） ====== */
+    @Excel(name = "费用类别")
+    private String feeType;
+
+    @Excel(name = "费用类型code")
+    private String serviceItemsCode;
+
+    @Excel(name = "费用类型")
+    private String serviceItemsName;
+
+    @Excel(name = "一级费用科目code")
+    private String firstSubjectCode;
+
+    @Excel(name = "一级费用科目")
+    private String firstSubjectName;
+
+    @Excel(name = "二级费用科目code")
+    private String secondSubjectCode;
+
+    @Excel(name = "二级费用科目")
+    private String secondSubjectName;
+
+    @Excel(name = "明细金额")
+    private BigDecimal billingAmount;
+}

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java

@@ -102,6 +102,10 @@ public class BillingStatementDTO extends BaseVOEntity{
     @Excel(name = "收支类型", readConverterExp = "1=-应收，2-应付")
     private Integer accountExpenseType;
 
+    @ApiModelProperty("收支类型（1-应收，2-应付）")
+    @Excel(name = "收支类型", readConverterExp = "1=-应收，2-应付")
+    private Integer billType;
+
     @ApiModelProperty("流水备注")
     @Excel(name = "流水备注")
     private String billingRemark;