From a9ecd6e702420bd255bfc19b2e2add4dd57d8f41 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 24 Jun 2022 14:53:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=8C=E5=87=8F1=20=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=BA=93=E7=A0=81=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/service/inout/impl/CodesServiceImpl.java | 2 +- .../glxp/sale/admin/service/inout/impl/OrderServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java index 1fe8942..322f5bd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -212,6 +211,7 @@ public class CodesServiceImpl implements CodesService { filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk()); filterInvProductRequest.setSupId(invProductDetailEntity.getSupId()); filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode()); + filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode()); if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 0e53a90..f9dad67 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -428,6 +428,7 @@ public class OrderServiceImpl implements OrderService { filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk()); filterInvProductRequest.setSupId(invProductDetailEntity.getSupId()); filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode()); + filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode()); if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } else { From 36a04cfe112750db750a71e45357e3150a13291a Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 24 Jun 2022 16:18:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8DJenkins=E8=87=AA=E5=8A=A8=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/pom.xml | 27 ------- .../resources/application-test.properties | 72 +++++++++++++++++++ .../src/main/resources/application.properties | 2 +- .../src/main/resources/mybatis/db.properties | 5 -- 4 files changed, 73 insertions(+), 33 deletions(-) create mode 100644 api-admin/src/main/resources/application-test.properties delete mode 100644 api-admin/src/main/resources/mybatis/db.properties diff --git a/api-admin/pom.xml b/api-admin/pom.xml index c3832af..d90be65 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -341,33 +341,6 @@ - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.4.0 - - src/main/resources/mybatis/configuration.xml - true - true - - - - Generate MyBatis Artifacts - - generate - - - - - - org.mybatis.generator - mybatis-generator-core - 1.4.0 - - - - - diff --git a/api-admin/src/main/resources/application-test.properties b/api-admin/src/main/resources/application-test.properties new file mode 100644 index 0000000..6043a1b --- /dev/null +++ b/api-admin/src/main/resources/application-test.properties @@ -0,0 +1,72 @@ +# \u751F\u4EA7\u73AF\u5883 +server.port=9996 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.username=root +#spring.datasource.password=root +spring.datasource.password=root +spring.datasource.hikari.connection-timeout=60000 +spring.datasource.hikari.maximum-pool-size=60 +spring.datasource.hikari.minimum-idle=10 +#server.servlet.context-path= +#logging.level.com.glxp.sale.admin.dao=debug +# \u8DE8\u57DF\u8BBE\u7F6E +cors.allowed-origins=* +cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN +cors.allowed-methods=GET,POST,PUT,DELETE,PATCH,OPTIONS +cors.allowed-Credentials=true +#\u8BF7\u6C42\u53C2\u6570\u957F\u5EA6 +server.tomcat.max-http-form-post-size=100MB +server.max-http-header-size=100MB +#\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB) +spring.servlet.multipart.max-file-size=200MB +spring.servlet.multipart.max-request-size=200MB +server.connectionTimeout=180000 +logging.level.com.glxp.sale.admin.dao=debug +logging.level.com.glxp.api.admin.dao.auth=debug +logging.level.com.glxp.api.admin.dao.basic=debug +logging.level.com.glxp.api.admin.dao.business=debug +logging.level.com.glxp.api.admin.dao.info=debug +logging.level.com.glxp.api.admin.dao.inout=debug +logging.level.com.glxp.api.admin.dao.inventory=debug +logging.level.com.glxp.api.admin.dao.thrsys=debug +# \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002 +logging.file=D:/glxpdata/udiwms/udiwms.log +#file_path=/home/glxpdata/udiwms +file_path=D:/glxpdata/udiwms +#UDI\u6570\u636E\u4E0B\u8F7D +UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test +#UDI_SERVER_URL=http://127.0.0.1:9994 +#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server +#UCLOD\u670D\u52A1 +#UCLOD_SERVER_URL=http://127.0.0.1:9997 +#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER +UCLOD_SERVER_URL=http://139.9.178.73/UDIC_UCLOUD_SERVER +#mips\u670D\u52A1\u5730\u5740 +UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server +#UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997 +UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query" +#\u534F\u8C03\u5E73\u53F0\u5BA2\u6237\u7AEF\u5730\u5740 +COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload +#\u5185\u5B58\u7801\u751F\u6210 +STOCK_PRINT_POST=http://139.159.187.130/UDI_WMS_MC/udiwms/stockprint/post +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss +spring.jackson.time-zone=GMT+8 +spring.main.allow-bean-definition-overriding=true +# Redis \u6570\u636E\u5E93\u7F16\u53F7 +spring.redis.database=4 +# Redis \u670D\u52A1\u5668IP +spring.redis.host=127.0.0.1 +# Redis \u7AEF\u53E3\u53F7 +spring.redis.port=6379 +# Redis \u5BC6\u7801 +spring.redis.password= +#\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570 +spring.redis.jedis.pool.max-active=8 +#\u6700\u5927\u7B49\u5F85\u65F6\u95F4 +spring.redis.jedis.pool.max-wait=-1 +#\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\u6570 +spring.redis.jedis.pool.max-idle=8 +#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570 +spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index 0f5d7b4..8e6dedf 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=pro +spring.profiles.active=test spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/api-admin/src/main/resources/mybatis/db.properties b/api-admin/src/main/resources/mybatis/db.properties deleted file mode 100644 index 8caaaaf..0000000 --- a/api-admin/src/main/resources/mybatis/db.properties +++ /dev/null @@ -1,5 +0,0 @@ -jdbc.jar.path=D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar -jdbc.driver=com.mysql.cj.jdbc.Driver -jdbc.url=jdbc:mysql://127.0.0.1:3306/warehouse?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false -jdbc.username=root -jdbc.password=123456 \ No newline at end of file