Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

mhd_finance/src/main/java/com/linke/finance/application/server/ncLog/NcLogApplicationService.java

@@ -0,0 +1,72 @@
+package com.linke.finance.application.server.ncLog;
+
+import com.linke.finance.domain.ncLog.repository.po.NcLogPO;
+import com.linke.finance.domain.ncLog.repository.todo.NcLogDO;
+import com.linke.finance.domain.ncLog.service.NcLogDomainService;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+/**
+ * 【请填写功能名称】ApplicationService
+ *
+ * @author gen
+ * @date 2025-12-04
+ */
+@Service
+@Slf4j
+public class NcLogApplicationService {
+    @Autowired
+    private NcLogDomainService ncLogDomainService;
+
+
+    /**
+     * 分页查询【请填写功能名称】列表
+     */
+
+    public List<NcLogPO> queryList(NcLogDO ncLogDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                ncLogDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            }
+        }
+        return ncLogDomainService.queryList(ncLogDO);
+    }
+
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    public Boolean insert(NcLogDO ncLogDO) {
+
+        return ncLogDomainService.insert(ncLogDO);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    public Boolean update(NcLogDO ncLogDO) {
+        return ncLogDomainService.update(ncLogDO);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     */
+    public boolean delete(Long[] ncLogIds) {
+        return ncLogDomainService.delete(ncLogIds);
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    public NcLogPO getInfo(Long ncLogId)
+    {
+        return ncLogDomainService.getInfo(ncLogId);
+    }
+
+
+}

mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java

@@ -610,6 +610,15 @@ public class ReconciliationApplicationService {
         return reconciliationDomainService.workflowProcessInstances(businessDocumentDetaliIds);
     }
 
+    public boolean synchronousNc(String businessDocumentDetaliIds)
+    {
+        return reconciliationDomainService.synchronousNc(businessDocumentDetaliIds);
+    }
+    public boolean synchronousNcSK(String businessDocumentDetaliIds)
+    {
+        return reconciliationDomainService.synchronousNcSK(businessDocumentDetaliIds);
+    }
+
     public int editIsInvoice(String innerNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber)
     {
         return reconciliationDomainService.editIsInvoice(innerNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber);

mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java

@@ -29,7 +29,7 @@ import java.util.Date;
 import java.util.List;
 /**
  * 收款单ApplicationService
- * 
+ *
  * @author gen
  * @date 2025-04-28
  */
@@ -138,5 +138,8 @@ public class TmsReceiptApplicationService {
         }
         return true;
     }
-
+    public boolean synchronousNc(String businessDocumentDetaliIds)
+    {
+        return tmsReceiptDomainService.synchronousNc(businessDocumentDetaliIds);
+    }
 }