From 0d75a422ddce375f0468f956bcc1fb658409d936 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 15 Jun 2024 09:07:00 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisSiteAccountController.java      | 12 ++++++++++--
 .../com/xdadan/erp/emis/domain/EmisSiteAccount.java  |  8 ++++++++
 .../src/main/resources/mapper/EmisMaterialMapper.xml |  1 -
 .../main/resources/mapper/EmisSiteAccountMapper.xml  |  7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java
index 3a07acc97..38afd83fe 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java
@@ -16,6 +16,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.common.utils.DateUtils;
+import com.xdadan.erp.emis.domain.EmisSite;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
@@ -128,16 +129,23 @@ public class EmisSiteAccountController extends EmisBaseController
             for(int i=0;i<codeArr.length;i++){
                 String siteCode=codeArr[i];
                 // 生成账户号
-//                String nowStr= DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS,new Date());
-//                String applySeqNo=nowStr+Math.round(Math.random() * 23 + 1000);
                 EmisSiteAccount addSite = new EmisSiteAccount();
                 // 一个站点一个账户号,基本户 最多 999
+
+                // 获取财务中心代码
+               EmisSite site= emisBaseService.getSiteByCode(siteCode);
+               if(site==null){
+                   continue;
+               }
+
                 String accCode=siteCode+"001";
                 addSite.setAccCode(accCode);
 
                 addSite.setSiteCode(siteCode);
                 addSite.setCurrency(emisSiteAccount.getCurrency());
 
+                addSite.setCenterCode(site.getParentSiteCode());
+
                 // 判断国家是否有重复
                 try {
                     emisSiteAccountService.insertEmisSiteAccount(addSite);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
index e749bbfdd..5a0ff00de 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
@@ -72,4 +72,12 @@ public class EmisSiteAccount extends BaseEntity
     /* 清理人编号 */
     private String clearManCode;
 
+
+    /* 站点 */
+    private String siteName;
+    /* 财务中心 */
+    private String centerName;
+    /* 清理站点 */
+    private String clearSiteName;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml b/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml
index a8e323b22..f163f666a 100644
--- a/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisMaterialMapper.xml
@@ -24,7 +24,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderNum"    column="order_num"    />
 
 
-
     </resultMap>
 
     <sql id="selectEmisMaterialVo">
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
index 6b7c4fff3..68dd07eef 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSiteAccountMapper">
 
-    <resultMap type="EmisSiteAccount" id="EmisSiteAccountResult">
+    <resultMap type="EmisSiteAccount" id="EmisSiteAccountResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="accCode"    column="acc_code"    />
         <result property="siteCode"    column="site_code"    />
@@ -23,6 +23,11 @@
         <result property="clearSiteCode"    column="clear_site_code"    />
         <result property="clearDate"    column="clear_date"    />
         <result property="clearManCode"    column="clear_man_code"    />
+
+        <association property="siteName"    column="site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="centerName"    column="center_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="clearSiteName"    column="clear_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+
     </resultMap>
 
     <sql id="selectEmisSiteAccountVo">