diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java
index 830767dbe..02f610808 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/expenseAccount/ExpenseAccountAssembler.java
@@ -35,7 +35,15 @@ public class ExpenseAccountAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java
index d3b340d79..766d4b5ef 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/assember/serviceItemsManage/ServiceItemsManageAssembler.java
@@ -35,7 +35,15 @@ public class ServiceItemsManageAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java
index d1f0baa38..3679d7509 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java
@@ -57,18 +57,13 @@ public class ExpenseAccountApi extends BaseController{
     {
         logger.info("收到查询费用科目列表请求，参数：{}", expenseAccountDTO);
         try {
-            //转换实体，如果 expenseAccountDTO 为 null，创建一个新的对象
+            //转换实体（查询时不需要设置创建人和更新人信息）
             if (expenseAccountDTO == null) {
                 expenseAccountDTO = new ExpenseAccountDTO();
                 logger.info("expenseAccountDTO 为 null，创建新对象");
             }
-            ExpenseAccountDO expenseAccountDO = expenseAccountAssembler.toDO(expenseAccountDTO);
-            if(StringUtils.isBlank(expenseAccountDTO.getCreateByName())){
-                expenseAccountDO.setCreateByName(null);
-            }
-            if(StringUtils.isBlank(expenseAccountDTO.getUpdateByName())){
-                expenseAccountDO.setUpdateByName(null);
-            }
+            ExpenseAccountDO expenseAccountDO = new ExpenseAccountDO();
+            BeanUtils.copyProperties(expenseAccountDTO, expenseAccountDO);
             logger.info("转换后的 ExpenseAccountDO：{}", expenseAccountDO);
             startPage();
             logger.info("分页参数已设置");
diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java
index b862613d7..60b213989 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/serviceItemsManage/ServiceItemsManageApi.java
@@ -9,6 +9,7 @@ import com.mhd.basic.interfaces.assember.serviceItemsManage.ServiceItemsManageAs
 import com.mhd.basic.interfaces.dto.serviceItemsManage.ServiceItemsManageDTO;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,14 +40,9 @@ public class ServiceItemsManageApi extends BaseController{
     @GetMapping("/list")
     public TableDataInfo list(ServiceItemsManageDTO serviceItemsManageDTO)
     {
-        //转换实体
-        ServiceItemsManageDO serviceItemsManageDO = serviceItemsManageAssembler.toDO(serviceItemsManageDTO);
-        if(StringUtils.isBlank(serviceItemsManageDTO.getCreateByName())){
-            serviceItemsManageDO.setCreateByName(null);
-        }
-        if(StringUtils.isBlank(serviceItemsManageDTO.getUpdateByName())){
-            serviceItemsManageDO.setUpdateByName(null);
-        }
+        //转换实体（查询时不需要设置创建人和更新人信息）
+        ServiceItemsManageDO serviceItemsManageDO = new ServiceItemsManageDO();
+        BeanUtils.copyProperties(serviceItemsManageDTO, serviceItemsManageDO);
         startPage();
         List<ServiceItemsManagePO> list = serviceItemsManageApplicationService.queryList(serviceItemsManageDO);
         return getDataTable(list);
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml
index e30db65c0..14d09a526 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml
@@ -11,7 +11,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from contract_manage
         where
             del_flag = 1
-        order by create_time desc
     </sql>
 
     <sql id="selectContractManagePo1">
@@ -116,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultType="com.mhd.basic.domain.contractManage.repository.po.ContractManagePO">
         <include refid="selectContractManagePo"/>
         <include refid="common_where"/>
+        order by create_time desc
     </select>
 
 
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
index 41cf1fdd0..88cf0987e 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
@@ -102,7 +102,7 @@
         WHERE
         a.del_flag = 1
         <include refid="common_where"/>
-        order by a.update_time DESC
+        order by a.create_time DESC
     </select>
     <select id="selectCostSubject" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.ExpenseAccountDO"
             resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO">
@@ -145,7 +145,14 @@
 
 
     <sql id="common_where_two">
-        <if test="expenseAccountDO.topOrganizationId != null ">
+        <!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
+        <!-- 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（不添加组织过滤条件） -->
+        <if test="expenseAccountDO.organizationId != null">
+            <!-- 如果设置了 organizationId，添加 organization_id 条件 -->
+            and organization_id = #{expenseAccountDO.organizationId}
+        </if>
+        <if test="expenseAccountDO.topOrganizationId != null and expenseAccountDO.organizationId == null">
+            <!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 -->
             and top_organization_id = #{expenseAccountDO.topOrganizationId}
         </if>
     </sql>
diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java
index a141ccd3d..55eb16375 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java
@@ -265,6 +265,13 @@ public class BillManageApplicationService {
         return billManageDomainService.confirmBilling(billManageDO);
     }
 
+
+    public int editIsInvoice(String billNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber)
+    {
+        return billManageDomainService.editIsInvoice(billNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber);
+    }
+
+
     /**
      * 查询对账详情
      */
@@ -529,4 +536,4 @@ public class BillManageApplicationService {
 
 
 
-}
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/conditionalMapping/ConditionalMappingApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/conditionalMapping/ConditionalMappingApplicationService.java
index 35c930bac..6423cd94f 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/application/server/conditionalMapping/ConditionalMappingApplicationService.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/conditionalMapping/ConditionalMappingApplicationService.java
@@ -38,10 +38,40 @@ public class ConditionalMappingApplicationService {
 
     public List<ConditionalMappingPO> queryList(ConditionalMappingDO conditionalMappingDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null){
-            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                conditionalMappingDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            Long frontendOrganizationId = conditionalMappingDO.getOrganizationId(); // 前端传递的 organizationId
+            
+            // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己且 topOrganizationId=2827
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                // 南光组织（organizationId=2827）：可以查询所有组织的数据
+                if (frontendOrganizationId != null) {
+                    // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤
+                    conditionalMappingDO.setOrganizationId(frontendOrganizationId);
+                    conditionalMappingDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件
+                } else {
+                    // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据
+                    conditionalMappingDO.setOrganizationId(null);
+                    conditionalMappingDO.setTopOrganizationId(null);
+                }
+            } else {
+                // 其他组织：设置organizationId为当前组织ID，并且设置topOrganizationId=2827
+                // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
+                if (frontendOrganizationId != null && userOrganizationId != null) {
+                    // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
+                    if (!frontendOrganizationId.equals(userOrganizationId)) {
+                        // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询
+                        conditionalMappingDO.setOrganizationId(userOrganizationId);
+                    }
+                    // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值
+                } else {
+                    // 前端没有传递 organizationId，使用当前登录用户的组织ID
+                    if (userOrganizationId != null) {
+                        conditionalMappingDO.setOrganizationId(userOrganizationId);
+                    }
+                }
+                // 对于非2827组织，必须设置 topOrganizationId=2827
+                conditionalMappingDO.setTopOrganizationId(2827L);
             }
         }
         return conditionalMappingDomainService.queryList(conditionalMappingDO);
diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/mappingMethod/MappingMethodApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/mappingMethod/MappingMethodApplicationService.java
index 5286931f9..44b7689bf 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/application/server/mappingMethod/MappingMethodApplicationService.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/mappingMethod/MappingMethodApplicationService.java
@@ -37,10 +37,40 @@ public class MappingMethodApplicationService {
 
     public List<MappingMethodPO> queryList(MappingMethodDO mappingMethodDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null){
-            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                mappingMethodDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
+            Long frontendOrganizationId = mappingMethodDO.getOrganizationId(); // 前端传递的 organizationId
+            
+            // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己且 topOrganizationId=2827
+            if (userOrganizationId != null && userOrganizationId == 2827L) {
+                // 南光组织（organizationId=2827）：可以查询所有组织的数据
+                if (frontendOrganizationId != null) {
+                    // 前端传递了 organizationId（包括2827或其他组织），使用前端传递的值进行过滤
+                    mappingMethodDO.setOrganizationId(frontendOrganizationId);
+                    mappingMethodDO.setTopOrganizationId(null); // 明确设置为 null，避免使用 topOrganizationId 条件
+                } else {
+                    // 前端没有传递 organizationId，清空组织过滤条件，查询所有组织的数据
+                    mappingMethodDO.setOrganizationId(null);
+                    mappingMethodDO.setTopOrganizationId(null);
+                }
+            } else {
+                // 其他组织：设置organizationId为当前组织ID，并且设置topOrganizationId=2827
+                // 如果前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
+                if (frontendOrganizationId != null && userOrganizationId != null) {
+                    // 前端传递了 organizationId，验证是否与当前登录用户的组织ID一致
+                    if (!frontendOrganizationId.equals(userOrganizationId)) {
+                        // 前端传递了其他组织的 organizationId，强制使用当前登录用户的组织ID，防止越权查询
+                        mappingMethodDO.setOrganizationId(userOrganizationId);
+                    }
+                    // 如果前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值
+                } else {
+                    // 前端没有传递 organizationId，使用当前登录用户的组织ID
+                    if (userOrganizationId != null) {
+                        mappingMethodDO.setOrganizationId(userOrganizationId);
+                    }
+                }
+                // 对于非2827组织，必须设置 topOrganizationId=2827
+                mappingMethodDO.setTopOrganizationId(2827L);
             }
         }
         return mappingMethodDomainService.queryList(mappingMethodDO);
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java
index 08d4e0691..456267ccd 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java
@@ -9,6 +9,7 @@ import java.math.BigDecimal;
 import lombok.Data;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 /**
@@ -183,4 +184,45 @@ public class BillManage extends BaseVOEntity{
 
     @ApiModelProperty("结算单优惠金额")
     private BigDecimal settlementDiscountsAmount;
-}
+
+    @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）")
+    private Integer isInvoice;
+
+
+    @ApiModelProperty(value = "发票表ID")
+    private String invoiceId;
+
+    @ApiModelProperty(value = "开票时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date invoiceMakeTime;
+
+
+    @ApiModelProperty(value = "申请发票单号")
+    private String applyNumber;
+
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer synchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date synchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String ncId;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer skSynchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date skSynchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String skNcId;
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/facade/IBillManageService.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/facade/IBillManageService.java
index 7320eaa64..86fb377e2 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/facade/IBillManageService.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/facade/IBillManageService.java
@@ -40,4 +40,6 @@ public interface IBillManageService extends IService<BillManage>
      * 查询账单管理
      */
     public BillManagePO getInfo(Long billManageId);
-}
+
+    public int editIsInvoice(String billNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber);
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
index 3f54433ef..9a43ec743 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
@@ -1,5 +1,7 @@
 package com.mhd.bms.domain.billManage.repository.persistence;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mhd.bms.domain.billManage.entity.BillManage;
 import com.mhd.bms.domain.billManage.repository.facade.IBillManageService;
@@ -10,6 +12,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -78,4 +82,47 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
         BeanUtils.copyProperties(billManage,billManagePO);
         return billManagePO;
     }
-}
+
+    @Override
+    public int editIsInvoice(String billNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber) {
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(billNumber)){
+            BillManage billManage= billManageMapper.selectOne(new QueryWrapper<BillManage>().lambda()
+                    .eq(BillManage::getBillNumber,billNumber)
+                    .eq(BillManage::getDelFlag,1));
+            if(ObjectUtil.isNotNull(billManage)){
+                billManage.setIsInvoice(isInvoice);
+                billManage.setInvoiceId(invoiceId);
+                billManage.setApplyNumber(applyNumber);
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(invoiceMakeTime)){
+                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    try {
+                        billManage.setInvoiceMakeTime(formatter.parse(invoiceMakeTime));
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }
+                return billManageMapper.updateById(billManage);
+            }
+        }else if(org.apache.commons.lang3.StringUtils.isNotBlank(invoiceId)){
+            BillManage billManage= billManageMapper.selectOne(new QueryWrapper<BillManage>().lambda()
+                    .eq(BillManage::getInvoiceId,invoiceId)
+                    .eq(BillManage::getDelFlag,1));
+            if(ObjectUtil.isNotNull(billManage)){
+                billManage.setIsInvoice(isInvoice);
+                billManage.setInvoiceId(invoiceId);
+                billManage.setApplyNumber(applyNumber);
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(invoiceMakeTime)){
+                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    try {
+                        billManage.setInvoiceMakeTime(formatter.parse(invoiceMakeTime));
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }
+                return billManageMapper.updateById(billManage);
+            }
+        }
+
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java
index 938556f17..aedc20879 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java
@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 /**
@@ -194,4 +195,45 @@ public class BillManagePO extends BaseVOEntity{
 
     @ApiModelProperty("流水ids")
     private String billingStatementIds;
-}
+
+    @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）")
+    private Integer isInvoice;
+
+
+    @ApiModelProperty(value = "发票表ID")
+    private String invoiceId;
+
+    @ApiModelProperty(value = "开票时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date invoiceMakeTime;
+
+
+    @ApiModelProperty(value = "申请发票单号")
+    private String applyNumber;
+
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer synchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date synchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String ncId;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer skSynchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date skSynchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String skNcId;
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java
index 3bd8d7858..89d749056 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import io.swagger.annotations.ApiModelProperty;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.List;
 import java.util.Set;
@@ -205,4 +206,45 @@ public class BillManageDO extends BaseVOEntity{
 
     @ApiModelProperty("结算单优惠金额")
     private BigDecimal settlementDiscountsAmount;
-}
+
+    @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）")
+    private Integer isInvoice;
+
+
+    @ApiModelProperty(value = "发票表ID")
+    private String invoiceId;
+
+    @ApiModelProperty(value = "开票时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date invoiceMakeTime;
+
+
+    @ApiModelProperty(value = "申请发票单号")
+    private String applyNumber;
+
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer synchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date synchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String ncId;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer skSynchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date skSynchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String skNcId;
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java
index 65150c8ba..39d7b759f 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java
@@ -297,6 +297,12 @@ public class BillManageDomainService {
         return flag && three;
     }
 
+
+    public int editIsInvoice(String billNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber)
+    {
+        return billManageService.editIsInvoice(billNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber);
+    }
+
     /**
      * 处理数据
      */
@@ -503,4 +509,4 @@ public class BillManageDomainService {
     public List<BillManage> billAnalysisList(QueryWrapper<BillManage> queryWrapper) {
         return billManageService.list(queryWrapper);
     }
-}
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingRules/BillingRulesAssembler.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingRules/BillingRulesAssembler.java
index 3942d6cc5..274261525 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingRules/BillingRulesAssembler.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingRules/BillingRulesAssembler.java
@@ -33,7 +33,15 @@ public class BillingRulesAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         if(billingRulesDTO.getBillingRulesId() != null){
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingStatement/BillingStatementAssembler.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingStatement/BillingStatementAssembler.java
index 64b47c967..b63293cb4 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingStatement/BillingStatementAssembler.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/billingStatement/BillingStatementAssembler.java
@@ -35,7 +35,15 @@ public class BillingStatementAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         if(billingStatementDTO.getBillingStatementId() != null){
@@ -72,7 +80,15 @@ public class BillingStatementAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         if(billingStatementCollectDTO.getBillingStatementId() != null){
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/conditionalMapping/ConditionalMappingAssembler.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/conditionalMapping/ConditionalMappingAssembler.java
index 8167c37fe..a8494bc62 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/conditionalMapping/ConditionalMappingAssembler.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/conditionalMapping/ConditionalMappingAssembler.java
@@ -33,7 +33,15 @@ public class ConditionalMappingAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         if(conditionalMappingDTO.getConditionalMappingId() != null){
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/documentType/DocumentTypeAssembler.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/documentType/DocumentTypeAssembler.java
index 1018c9396..6244b728d 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/documentType/DocumentTypeAssembler.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/documentType/DocumentTypeAssembler.java
@@ -33,7 +33,15 @@ public class DocumentTypeAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         if(documentTypeDTO.getDocumentTypeId() != null){
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/mappingMethod/MappingMethodAssembler.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/mappingMethod/MappingMethodAssembler.java
index fcd04fc3d..39e619c66 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/mappingMethod/MappingMethodAssembler.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/mappingMethod/MappingMethodAssembler.java
@@ -33,7 +33,15 @@ public class MappingMethodAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         if(mappingMethodDTO.getMappingMethodId() != null){
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/settlementCustomers/SettlementCustomersAssembler.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/settlementCustomers/SettlementCustomersAssembler.java
index 7078ecf65..458fbd23a 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/settlementCustomers/SettlementCustomersAssembler.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/assembler/settlementCustomers/SettlementCustomersAssembler.java
@@ -33,7 +33,15 @@ public class SettlementCustomersAssembler {
         if (ObjectUtil.isNull(loginUser)) {
             throw new DigitalLogisticsException(UserError.TIMEOUT);
         }
-        String userName = loginUser.getUsername();
+        // 获取用户姓名，优先使用userPo中的userName，如果为空则使用realname，最后使用username
+        String userName = null;
+        if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null) {
+            userName = loginUser.getUserPo().getUserName();
+        } else if (loginUser.getRealname() != null) {
+            userName = loginUser.getRealname();
+        } else {
+            userName = loginUser.getUsername();
+        }
         // 获取登录人id
         Long userId = loginUser.getUserid();
         if(settlementCustomersDTO.getSettlementCustomersId() != null){
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java
index 7cb79e109..ac4b7be25 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import io.swagger.annotations.ApiModelProperty;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.List;
 import java.util.Set;
@@ -211,4 +212,45 @@ public class BillManageDTO extends BaseVOEntity{
 
     @ApiModelProperty("结算单优惠金额")
     private BigDecimal settlementDiscountsAmount;
-}
+
+    @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）")
+    private Integer isInvoice;
+
+
+    @ApiModelProperty(value = "发票表ID")
+    private String invoiceId;
+
+    @ApiModelProperty(value = "开票时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date invoiceMakeTime;
+
+
+    @ApiModelProperty(value = "申请发票单号")
+    private String applyNumber;
+
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer synchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date synchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String ncId;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer skSynchronousStatus;
+
+
+    @ApiModelProperty(value = "nc同步时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date skSynchronousTime;
+
+    @ApiModelProperty(value = "nc唯一标识")
+    private String skNcId;
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BillManageApi.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BillManageApi.java
index 5b161eafe..a40d553e7 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BillManageApi.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BillManageApi.java
@@ -13,6 +13,8 @@ import com.mhd.bms.domain.billingStatement.repository.todo.BillingStatementDO;
 import com.mhd.bms.infrastructure.utils.UniqueKeyUtil;
 import com.mhd.bms.interfaces.dto.billingStatement.BillingStatementDTO;
 import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.log.annotation.Log;
+import com.mhd.common.log.enums.BusinessType;
 import com.mhd.common.redis.enums.RedisLockTypeEnum;
 import com.mhd.common.redis.service.RedisLock;
 import io.swagger.annotations.ApiOperation;
@@ -22,13 +24,7 @@ import org.redisson.api.RLock;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.mhd.bms.interfaces.dto.billManage.BillManageDTO;
 import com.mhd.bms.domain.billManage.repository.todo.BillManageDO;
 import com.mhd.bms.domain.billManage.repository.po.BillManagePO;
@@ -157,6 +153,23 @@ public class BillManageApi extends BaseController{
         }
     }
 
+    /**
+     * 发票开票修改对账单的开票状态
+     */
+    @Log(title = "对账单", description = "开票修改对账单的开票状态）", businessType = BusinessType.OTHER)
+    @ApiOperation("开票修改对账单的开票状态")
+    @GetMapping("/editIsInvoice")
+    public AjaxResult editIsInvoice(@RequestParam(name="billNumber") String billNumber,
+                                    @RequestParam(name="isInvoice") Integer isInvoice,
+                                    @RequestParam(name="invoiceId") String invoiceId,
+                                    @RequestParam(name="invoiceMakeTime") String invoiceMakeTime,
+                                    @RequestParam(name="applyNumber") String applyNumber)
+    {
+
+        billManageApplicationService.editIsInvoice(billNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber);
+        return AjaxResult.success("发票开票修改对账单的开票状态成功");
+    }
+
 
 
     /**
@@ -281,4 +294,4 @@ public class BillManageApi extends BaseController{
 
 
 
-}
+}
\ No newline at end of file
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/ConditionalMappingApi.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/ConditionalMappingApi.java
index f73d320ca..031a4cda3 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/ConditionalMappingApi.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/ConditionalMappingApi.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.mhd.bms.application.server.conditionalMapping.ConditionalMappingApplicationService;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.mhd.bms.interfaces.dto.conditionalMapping.ConditionalMappingDTO;
@@ -37,8 +38,9 @@ public class ConditionalMappingApi extends BaseController{
     @GetMapping("/list")
     public TableDataInfo list(ConditionalMappingDTO conditionalMappingDTO)
     {
-        //转换实体
-        ConditionalMappingDO conditionalMappingDO = conditionalMappingAssembler.toDO(conditionalMappingDTO);
+        //转换实体（查询时不需要设置创建人和更新人信息）
+        ConditionalMappingDO conditionalMappingDO = new ConditionalMappingDO();
+        BeanUtils.copyProperties(conditionalMappingDTO, conditionalMappingDO);
         startPage();
         List<ConditionalMappingPO> list = conditionalMappingApplicationService.queryList(conditionalMappingDO);
         return getDataTable(list);
diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/DocumentTypeApi.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/DocumentTypeApi.java
index 858952bfb..282602fd2 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/DocumentTypeApi.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/DocumentTypeApi.java
@@ -41,8 +41,9 @@ public class DocumentTypeApi extends BaseController{
     @GetMapping("/list")
     public TableDataInfo list(DocumentTypeDTO documentTypeDTO)
     {
-        //转换实体
-        DocumentTypeDO documentTypeDO = documentTypeAssembler.toDO(documentTypeDTO);
+        //转换实体（查询时不需要设置创建人和更新人信息）
+        DocumentTypeDO documentTypeDO = new DocumentTypeDO();
+        BeanUtils.copyProperties(documentTypeDTO, documentTypeDO);
         startPage();
         List<DocumentTypePO> list = documentTypeApplicationService.queryList(documentTypeDO);
         return getDataTable(list);
diff --git a/mhd_bms/src/main/resources/mapper/ConditionalMappingMapper.xml b/mhd_bms/src/main/resources/mapper/ConditionalMappingMapper.xml
index 327e611ea..d50c1e808 100644
--- a/mhd_bms/src/main/resources/mapper/ConditionalMappingMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/ConditionalMappingMapper.xml
@@ -16,12 +16,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             del_flag = 1
         <include refid="common_where"></include>
+        ORDER BY create_time DESC
     </select>
 
     <sql id="common_where">
         <if test="conditionalMappingDO.topOrganizationId != null  and conditionalMappingDO.topOrganizationId != ''">
             AND top_organization_id = #{conditionalMappingDO.topOrganizationId}
         </if>
+        <if test="conditionalMappingDO.organizationId != null">
+            AND organization_id = #{conditionalMappingDO.organizationId}
+        </if>
         <if test="conditionalMappingDO.sourceContent != null  and conditionalMappingDO.sourceContent != ''">
             AND source_content like concat('%', #{conditionalMappingDO.sourceContent}, '%')
         </if>
diff --git a/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml b/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml
index b757f6179..bd5cc8a84 100644
--- a/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/MappingMethodMapper.xml
@@ -14,12 +14,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from mapping_method
         where del_flag = 1
         <include refid="common_where"/>
+        ORDER BY create_time DESC
     </select>
 
     <sql id="common_where">
         <if test="mappingMethodDO.topOrganizationId != null  and mappingMethodDO.topOrganizationId != ''">
             AND top_organization_id = #{mappingMethodDO.topOrganizationId}
         </if>
+        <if test="mappingMethodDO.organizationId != null">
+            AND organization_id = #{mappingMethodDO.organizationId}
+        </if>
         <if test="mappingMethodDO.methodName != null  and mappingMethodDO.methodName != ''">
             and method_name like concat('%', #{mappingMethodDO.methodName}, '%')
         </if>
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
index eec9a2bd5..e803c68e9 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
@@ -24,6 +24,10 @@ import com.mhd.wms.domain.pickingMaterialDetail.service.PickingMaterialDetailDom
 import com.mhd.wms.domain.pickingOrder.repository.po.PickingOrderPO;
 import com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO;
 import com.mhd.wms.domain.pickingOrder.service.PickingOrderDomainService;
+import com.mhd.wms.domain.outMaterialDetail.repository.facade.IOutMaterialDetailService;
+import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +57,8 @@ public class PickingOrderApplicationService {
     private UserServiceFeign userServiceFeign;
     @Autowired
     private SystemServiceFeign systemServiceFeign;
+    @Autowired
+    private IOutMaterialDetailService outMaterialDetailService;
 
 
     /**
@@ -611,10 +617,43 @@ public class PickingOrderApplicationService {
             PickingMaterialDetailDO returnPickingMaterialDetailDO = new PickingMaterialDetailDO();
             BeanUtils.copyProperties(pickingMaterialDetailPO, returnPickingMaterialDetailDO);
             returnPickingMaterialDetailDO.setActualQuantity(pickingMaterialDetailDO.getActualQuantity());
-            returnPickingMaterialDetailDO.setTotalArea(pickingMaterialDetailDO.getTotalArea());
-            returnPickingMaterialDetailDO.setTotalVolume(pickingMaterialDetailDO.getTotalVolume());
-            returnPickingMaterialDetailDO.setTotalGrossWeight(pickingMaterialDetailDO.getTotalGrossWeight());
-            returnPickingMaterialDetailDO.setTotalNetWeight(pickingMaterialDetailDO.getTotalNetWeight());
+            
+            // 毛重、净重、面积、体积：如果前端传递了值，使用前端传递的值（允许修改）；否则从出库单明细中自动带出
+            Long outUniqueId = pickingMaterialDetailPO.getOutUniqueId();
+            OutMaterialDetail outMaterialDetail = null;
+            if (outUniqueId != null) {
+                outMaterialDetail = outMaterialDetailService.getOne(new QueryWrapper<OutMaterialDetail>().lambda()
+                        .eq(OutMaterialDetail::getUniqueId, outUniqueId)
+                        .eq(OutMaterialDetail::getDelFlag, 1));
+            }
+            
+            // 总面积：优先使用前端传递的值，如果为空则从出库单明细中获取
+            if (pickingMaterialDetailDO.getTotalArea() != null) {
+                returnPickingMaterialDetailDO.setTotalArea(pickingMaterialDetailDO.getTotalArea());
+            } else if (outMaterialDetail != null && outMaterialDetail.getTotalArea() != null) {
+                returnPickingMaterialDetailDO.setTotalArea(outMaterialDetail.getTotalArea());
+            }
+            
+            // 总体积：优先使用前端传递的值，如果为空则从出库单明细中获取
+            if (pickingMaterialDetailDO.getTotalVolume() != null) {
+                returnPickingMaterialDetailDO.setTotalVolume(pickingMaterialDetailDO.getTotalVolume());
+            } else if (outMaterialDetail != null && outMaterialDetail.getTotalVolume() != null) {
+                returnPickingMaterialDetailDO.setTotalVolume(outMaterialDetail.getTotalVolume());
+            }
+            
+            // 总毛重：优先使用前端传递的值，如果为空则从出库单明细中获取
+            if (pickingMaterialDetailDO.getTotalGrossWeight() != null) {
+                returnPickingMaterialDetailDO.setTotalGrossWeight(pickingMaterialDetailDO.getTotalGrossWeight());
+            } else if (outMaterialDetail != null && outMaterialDetail.getTotalGrossWeight() != null) {
+                returnPickingMaterialDetailDO.setTotalGrossWeight(outMaterialDetail.getTotalGrossWeight());
+            }
+            
+            // 总净重：优先使用前端传递的值，如果为空则从出库单明细中获取
+            if (pickingMaterialDetailDO.getTotalNetWeight() != null) {
+                returnPickingMaterialDetailDO.setTotalNetWeight(pickingMaterialDetailDO.getTotalNetWeight());
+            } else if (outMaterialDetail != null && outMaterialDetail.getTotalNetWeight() != null) {
+                returnPickingMaterialDetailDO.setTotalNetWeight(outMaterialDetail.getTotalNetWeight());
+            }
             //是否开启了序列号管理
             if (pickingMaterialDetailPO.getSerialNumberManage() == 1){
                 if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
index 9c0001448..d25ed4add 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
@@ -665,18 +665,20 @@ public class StockReceiptOrderApplicationService {
         List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
         receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
             List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
-            ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
-            receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
-            receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
-            receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
-            receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
-            receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
-            receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
-            receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
-            receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
-            //只留二级
-            List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
-            receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
+            if (receiptMaterialDetailDOChildrenList1 != null && receiptMaterialDetailDOChildrenList1.size() > 0) {
+                ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
+                receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
+                receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
+                receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
+                receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
+                receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
+                receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
+                receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
+                receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
+                //只留二级
+                List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
+                receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
+            }
         });
         //收货装配参数
         StockReceiptOrderDO assembleStockReceiptOrderDO = assembleParamByReceipt(stockReceiptOrderDO);
@@ -727,24 +729,26 @@ public class StockReceiptOrderApplicationService {
         List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
         receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
             List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
-            ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.get(0);
-            receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
-            receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
-            receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
-            receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
-            receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
-            receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
-            receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
-            receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
-            //只留二级
-            List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = new ArrayList<>();
-            for (int i = 0; i < receiptMaterialDetailDOChildrenList1.size(); i++){
-                if (i == 0){
-                    continue;
+            if (receiptMaterialDetailDOChildrenList1 != null && receiptMaterialDetailDOChildrenList1.size() > 0) {
+                ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.get(0);
+                receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
+                receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
+                receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
+                receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
+                receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
+                receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
+                receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
+                receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
+                //只留二级
+                List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = new ArrayList<>();
+                for (int i = 0; i < receiptMaterialDetailDOChildrenList1.size(); i++){
+                    if (i == 0){
+                        continue;
+                    }
+                    receiptMaterialDetailDOChildrenList2.add(receiptMaterialDetailDOChildrenList1.get(i));
                 }
-                receiptMaterialDetailDOChildrenList2.add(receiptMaterialDetailDOChildrenList1.get(i));
+                receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
             }
-            receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
         });
         NoReceiptOrderDO noReceiptOrderDO = assembleParamByNoOrderReceipt(stockReceiptOrderDO);
         return stockReceiptOrderDomainService.noOrderReceipt(noReceiptOrderDO);