diff --git a/.gitignore b/.gitignore
index b252f4db..8eb01331 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 ./idea/
+/idea/
 /buildpackage/src/main/resources/banner.txt
 /webapp/target/
 /service/target/
diff --git a/base-buildpackage/pom.xml b/base-buildpackage/pom.xml
index bb6bacf6..89785ed2 100644
--- a/base-buildpackage/pom.xml
+++ b/base-buildpackage/pom.xml
@@ -55,6 +55,18 @@
                 <profile.active>xel</profile.active>
             </properties>
         </profile>
+        <profile>
+            <id>zhouju</id> <!--zj-->
+            <properties>
+                <profile.active>zhouju</profile.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>zhoujutest</id> <!--zjtest-->
+            <properties>
+                <profile.active>zhoujutest</profile.active>
+            </properties>
+        </profile>
     </profiles>
     <build>
         <finalName>kangarooDataCenterV3</finalName>
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java
index b3c44175..988e704a 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java
@@ -67,6 +67,8 @@ public class ZjMaterielSynchronizationEventEntity extends BaseEntity {
     private String field0047code;//物料类别
     private String field0048;//计量单位
     private String field0048code;//计量单位
+    private String accName;//
+    private String caccId;//
 
 
     public String getFormmain_id() {
@@ -500,5 +502,21 @@ public class ZjMaterielSynchronizationEventEntity extends BaseEntity {
     public void setField0043code(String field0043code) {
         this.field0043code = field0043code;
     }
+
+    public String getAccName() {
+        return accName;
+    }
+
+    public void setAccName(String accName) {
+        this.accName = accName;
+    }
+
+    public String getCaccId() {
+        return caccId;
+    }
+
+    public void setCaccId(String caccId) {
+        this.caccId = caccId;
+    }
 }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java
index 1b183c89..2b677270 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java
@@ -86,7 +86,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
     @Override
     @DSTransactional()
     public JsonResultEntity materielSynchronization(JSONObject requestJson) {
-        requestJson = setdata();
+        //requestJson = setdata();
         JSONObject reqJson = new JSONObject();
         JSONObject jsonStr = requestJson.getJSONObject("jsonStr");
         JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr");
@@ -304,7 +304,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                 inventorySubEntity.setDataSourceCode(zju8);
                 inventorySubEntity.setcInvSubCode(entity.getField0005());
                 inventorySubEntity = iInventorySubService.getInvSub(inventorySubEntity);
-                inventoryExtEntity.setDataSourceCode(zju8);
+                inventorySubEntity.setDataSourceCode(zju8);
 
             }else {
                 for (int i1 = 0; i1 < inventoryEntities.size(); i1++) {
@@ -316,18 +316,20 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                 inventoryExtEntity.setDataSourceCode(zju8);
                 inventoryExtEntity.setcInvCode(entity.getField0043code());
                 inventoryExtEntity = inventoryExtService.getInvExt(inventoryExtEntity);
+                inventoryExtEntity.setDataSourceCode(zju8);
                 inventorySubEntity.setDataSourceCode(zju8);
                 inventorySubEntity.setcInvSubCode(entity.getField0043code());
                 inventorySubEntity = iInventorySubService.getInvSub(inventorySubEntity);
+                inventorySubEntity.setDataSourceCode(zju8);
+
             }
             inventoryExtEntity.setcInvCode(wlcode.toString());
             inventorySubEntity.setcInvSubCode(wlcode.toString());
             entity.setField0005(wlcode.toString());
             //定制化字段
             inventoryEntity.setDataSourceCode(zju8);
-            inventoryEntity.setAcc_name("UFDATA_999_2025.dbo.");
-            inventoryEntity.setCacc_id("025");
-
+            inventoryEntity.setAcc_name(entity.getAccName());
+            inventoryEntity.setCacc_id(entity.getCaccId());
             logger.error("物料编码"+wlcode);
             //inventoryEntity.setAcc_name("UFDATA_998_2014.dbo.");
             //inventoryEntity.setCacc_id("998");
diff --git a/base-buildpackage/src/main/resources/application-zhouju.yml b/base-buildpackage/src/main/resources/application-zhouju.yml
new file mode 100644
index 00000000..b28904b0
--- /dev/null
+++ b/base-buildpackage/src/main/resources/application-zhouju.yml
@@ -0,0 +1,53 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: info
+  encodings: GBK
+  file:
+    #    日志保存路径
+    path: D:\yongansystem\log\zs
+spring:
+  data:
+    mongodb:
+#      host: 192.168.2.237
+#      port: 27017
+#      database: businesscenter
+#      auto-index-creation: true
+#      password: hzya1314
+#      username: hzya
+  flyway:
+    # 启动flyway migration, 默认为true
+    enabled: false
+  datasource:
+    dynamic:
+      druid:
+        filters: stat,log4j2
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: bd993088e8a7c3dc5f44441617f9b4bf
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: D:\yongansystem\file
+  tomcatpath: D:\yongansystem\apache-tomcat-9.0.97
+  pluginpath: D:\yongansystem\apache-tomcat-9.0.97\webapps\kangarooDataCenterV3\WEB-INF\classes
+zt:
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
+
+database:
+#  databaseName: businesscenter
+#  host: 192.168.2.237
+#  port: 3306
+#  username: root
+#  password: hzya@1314
+#  filePase: /Users/apple/Desktop/log
+#  fileName: data.sql
+#sftp:
+#  host: 192.168.2.237
+#  port: 9091
+#  username: cs237
+#  password: hzya@1314
+#  filePase: /databaseBack
diff --git a/base-buildpackage/src/main/resources/application-zhoujutest.yml b/base-buildpackage/src/main/resources/application-zhoujutest.yml
new file mode 100644
index 00000000..1cb17c0f
--- /dev/null
+++ b/base-buildpackage/src/main/resources/application-zhoujutest.yml
@@ -0,0 +1,53 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: info
+  encodings: GBK
+  file:
+    #    日志保存路径
+    path: D:\yongansystem\log\test
+spring:
+  data:
+    mongodb:
+#      host: 192.168.2.237
+#      port: 27017
+#      database: businesscenter
+#      auto-index-creation: true
+#      password: hzya1314
+#      username: hzya
+  flyway:
+    # 启动flyway migration, 默认为true
+    enabled: false
+  datasource:
+    dynamic:
+      druid:
+        filters: stat,log4j2
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/businesscenter_test?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: bd993088e8a7c3dc5f44441617f9b4bf
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: D:\yongansystem\file
+  tomcatpath: D:\yongansystem\apache-tomcat-9.0.97
+  pluginpath: D:\yongansystem\apache-tomcat-9.0.97\webapps\kangarooDataCenterV3\WEB-INF\classes
+zt:
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
+
+database:
+#  databaseName: businesscenter
+#  host: 192.168.2.237
+#  port: 3306
+#  username: root
+#  password: hzya@1314
+#  filePase: /Users/apple/Desktop/log
+#  fileName: data.sql
+#sftp:
+#  host: 192.168.2.237
+#  port: 9091
+#  username: cs237
+#  password: hzya@1314
+#  filePase: /databaseBack
diff --git a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java
index 68852146..7ebeeacc 100644
--- a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java
+++ b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java
@@ -40,7 +40,7 @@ public class temButtom {
 
     @Test
     public void test01() {
-        String a = AESUtil.encrypt("hzya@1314");
+        String a = AESUtil.encrypt("hzya1314");
         System.out.println(a);
         String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b");
         System.out.println(b);
diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml
index c1cf1bff..cadacf5a 100644
--- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml
+++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml
@@ -16,6 +16,16 @@
 		<result property="cidefine7" column="cidefine7" />
 	</resultMap>
 
+<!--	<sql id="InventoryExtEntity_Base_Column_List">-->
+<!--		cInvCode,-->
+<!--		cidefine1,-->
+<!--		cidefine2,-->
+<!--		cidefine3,-->
+<!--		cidefine4,-->
+<!--		cidefine5,-->
+<!--		cidefine6,-->
+<!-- 		cidefine7-->
+<!--	</sql>-->
 	<sql id="InventoryExtEntity_Base_Column_List">
 		cInvCode,
 		cidefine1,
@@ -23,10 +33,8 @@
 		cidefine3,
 		cidefine4,
 		cidefine5,
-		cidefine6,
-		cidefine7
+		cidefine6
 	</sql>
-
 	<!--通过ID获取数据 -->
 	<select id="entity_get" resultMap="get-InventoryExtEntity-result">
 		select
diff --git a/pom.xml b/pom.xml
index 419a8e17..c8578008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -470,33 +470,33 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <webResources>
-                        <resource>
-                            <directory>${basedir}/../base-service/src/main/webapp/WEB-INF/lib</directory>
-                            <targetPath>WEB-INF/lib/</targetPath>
-                            <filtering>false</filtering>
-                            <includes>
-                                <!-- 匹配所有jar包 -->
-                                <include>**/*.jar</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/../fw-bip/src/main/webapp/WEB-INF/lib</directory>
-                            <targetPath>WEB-INF/lib/</targetPath>
-                            <filtering>false</filtering>
-                            <includes>
-                                <!-- 匹配所有jar包 -->
-                                <include>**/*.jar</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/../fw-ningbobank/src/main/webapp/WEB-INF/lib</directory>
-                            <targetPath>WEB-INF/lib/</targetPath>
-                            <filtering>false</filtering>
-                            <includes>
-                                <!-- 匹配所有jar包 -->
-                                <include>**/*.jar</include>
-                            </includes>
-                        </resource>
+<!--                        <resource>-->
+<!--                            <directory>${basedir}/../base-service/src/main/webapp/WEB-INF/lib</directory>-->
+<!--                            <targetPath>WEB-INF/lib/</targetPath>-->
+<!--                            <filtering>false</filtering>-->
+<!--                            <includes>-->
+<!--                                &lt;!&ndash; 匹配所有jar包 &ndash;&gt;-->
+<!--                                <include>**/*.jar</include>-->
+<!--                            </includes>-->
+<!--                        </resource>-->
+<!--                        <resource>-->
+<!--                            <directory>${basedir}/../fw-bip/src/main/webapp/WEB-INF/lib</directory>-->
+<!--                            <targetPath>WEB-INF/lib/</targetPath>-->
+<!--                            <filtering>false</filtering>-->
+<!--                            <includes>-->
+<!--                                &lt;!&ndash; 匹配所有jar包 &ndash;&gt;-->
+<!--                                <include>**/*.jar</include>-->
+<!--                            </includes>-->
+<!--                        </resource>-->
+<!--                        <resource>-->
+<!--                            <directory>${basedir}/../fw-ningbobank/src/main/webapp/WEB-INF/lib</directory>-->
+<!--                            <targetPath>WEB-INF/lib/</targetPath>-->
+<!--                            <filtering>false</filtering>-->
+<!--                            <includes>-->
+<!--                                &lt;!&ndash; 匹配所有jar包 &ndash;&gt;-->
+<!--                                <include>**/*.jar</include>-->
+<!--                            </includes>-->
+<!--                        </resource>-->
                     </webResources>
                 </configuration>
             </plugin>