aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-07 08:43:09 +08:00
parent 7a1daa0dad
commit bd040530f9
8 changed files with 6 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__com_xdadan_emis_common_1_0_0.xml
View File

@ -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>

13
.idea/libraries/Maven__com_xdadan_emis_framework_1_0_0.xml
View File

@ -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>

13
.idea/libraries/Maven__com_xdadan_emis_system_1_0_1.xml
View File

@ -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>

13
.idea/libraries/Maven__com_xdadan_emis_wms_1_0_0.xml
View File

@ -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>

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -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();

1
emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
View File

@ -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>

1
emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
View File

@ -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>

8
emis-wms-web/emis-wms-web.iml
View File

@ -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" />