From bd040530f99d674c113ca88ccec5f3efac9d0af9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 May 2024 08:43:09 +0800
Subject: [PATCH] md

---
 .../Maven__com_xdadan_emis_common_1_0_0.xml         | 13 -------------
 .../Maven__com_xdadan_emis_framework_1_0_0.xml      | 13 -------------
 .../Maven__com_xdadan_emis_system_1_0_1.xml         | 13 -------------
 .../libraries/Maven__com_xdadan_emis_wms_1_0_0.xml  | 13 -------------
 .../xdadan/erp/emis/service/EmisBaseService.java    |  2 ++
 .../resources/mapper/EmisCustomerAddressMapper.xml  |  1 -
 .../resources/mapper/EmisCustomerUserMapper.xml     |  1 -
 emis-wms-web/emis-wms-web.iml                       |  8 ++++----
 8 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 100644 .idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml
 delete mode 100644 .idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml
 delete mode 100644 .idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml
 delete mode 100644 .idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml

diff --git a/.idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml b/.idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml
deleted file mode 100644
index 212365c71..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.xdadan:emis-common:1.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-common/1.0.0/emis-common-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-common/1.0.0/emis-common-1.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-common/1.0.0/emis-common-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml b/.idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml
deleted file mode 100644
index 2774482d9..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.xdadan:emis-framework:1.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-framework/1.0.0/emis-framework-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-framework/1.0.0/emis-framework-1.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-framework/1.0.0/emis-framework-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml b/.idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml
deleted file mode 100644
index 59dd7d979..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.xdadan:emis-system:1.0.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-system/1.0.1/emis-system-1.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-system/1.0.1/emis-system-1.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-system/1.0.1/emis-system-1.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml b/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml
deleted file mode 100644
index a93d05779..000000000
--- a/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.xdadan:emis-wms:1.0.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/emis-wms/pom.xml!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/emis-wms/emis-wms-1.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/emis-wms/emis-wms-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 7e5cfe959..448f8c761 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -239,6 +239,7 @@ public class EmisBaseService {
              // 创建地址
              emisCustomerAddressNew.setId(null);
              emisCustomerAddressNew.setCustomerCode(emisCustomerUser.getCustomerCode());
+             emisCustomerAddressNew.preInsert();
              emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddressNew);
 
              return emisCustomerAddressNew;
@@ -264,6 +265,7 @@ public class EmisBaseService {
                  EmisCustomerUser emisCustomerUser=createCustomerUser(newEmisCustomerUser);
                  customerCode = emisCustomerUser.getCustomerCode();
                  addresItem.setCustomerCode(customerCode);
+                 emisCustomerAddressNew.preUpdate();
                  emisCustomerAddressMapper.updateEmisCustomerAddress(addresItem);
              }else{
                  customerCode=addresItem.getCustomerCode();
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index e9e162763..4b7ee7ba9 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -173,7 +173,6 @@
     <update id="updateEmisCustomerAddress" parameterType="EmisCustomerAddress">
         update emis_customer_address
         <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
             <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
             <if test="shortName != null and shortName != ''">short_name = #{shortName},</if>
             <if test="alias != null and alias != ''">alias = #{alias},</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index 06c2cc343..9a5cdc39a 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -310,7 +310,6 @@
             <if test="openid != null and openid != ''">openid = #{openid},</if>
             <if test="monthlyPayCode != null and monthlyPayCode != ''">monthly_pay_code = #{monthlyPayCode},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
-            <if test="password != null and password != ''">password = #{password},</if>
             <if test="ownerSite != null and ownerSite != ''">owner_site = #{ownerSite},</if>
             <if test="country != null and country != ''">country = #{country},</if>
             <if test="province != null and province != ''">province = #{province},</if>
diff --git a/emis-wms-web/emis-wms-web.iml b/emis-wms-web/emis-wms-web.iml
index bf316ad6c..f88ab46e0 100644
--- a/emis-wms-web/emis-wms-web.iml
+++ b/emis-wms-web/emis-wms-web.iml
@@ -19,8 +19,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-framework:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-system:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.xdadan:emis-framework:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.xdadan:emis-system:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.10" level="project" />
@@ -77,8 +77,8 @@
     <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.1.2" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.10.0" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.10.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-wms:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-common:1.0.0" level="project" />
+    <orderEntry type="module" module-name="emis-wms" />
+    <orderEntry type="library" name="Maven: com.xdadan:emis-common:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.5" level="project" />