Commit 75b6df89 by huluobin

# 更新

parent 461e8ca5
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.bailuntec</groupId> <artifactId>finance-balance-sheet</artifactId>
<artifactId>finance-balance-sheet</artifactId> <version>1.0-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version> <packaging>jar</packaging>
<packaging>jar</packaging>
<name>finance-balance-sheet</name>
<name>finance-balance-sheet</name>
<parent>
<parent> <artifactId>data-finance</artifactId>
<artifactId>data-finance</artifactId> <groupId>com.bailuntec</groupId>
<groupId>com.bailuntec</groupId> <version>1.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version> </parent>
</parent>
<properties>
<properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version>
<java.version>1.8</java.version> <mysql-connector.version>5.1.47</mysql-connector.version>
<mysql-connector.version>5.1.47</mysql-connector.version> <mybatis.version>1.3.2</mybatis.version>
<mybatis.version>1.3.2</mybatis.version> <mybatis-generator.version>1.3.7</mybatis-generator.version>
<mybatis-generator.version>1.3.7</mybatis-generator.version> <fastjson.version>1.2.51</fastjson.version>
<fastjson.version>1.2.51</fastjson.version> <druid.version>1.1.9</druid.version>
<druid.version>1.1.9</druid.version> <pageHelper.version>1.2.9</pageHelper.version>
<pageHelper.version>1.2.9</pageHelper.version> <commons-collections4.vserion>4.2</commons-collections4.vserion>
<commons-collections4.vserion>4.2</commons-collections4.vserion> </properties>
</properties>
<dependencies>
<dependencies> <dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-web</artifactId> </dependency>
</dependency>
<dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-boot-starter-test</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency>
<dependency>
<dependency> <groupId>mysql</groupId>
<groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId>
<artifactId>mysql-connector-java</artifactId> <version>${mysql-connector.version}</version>
<version>${mysql-connector.version}</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>org.mybatis.spring.boot</groupId>
<groupId>org.mybatis.spring.boot</groupId> <artifactId>mybatis-spring-boot-starter</artifactId>
<artifactId>mybatis-spring-boot-starter</artifactId> <version>${mybatis.version}</version>
<version>${mybatis.version}</version> </dependency>
</dependency>
<!-- mybatis generator -->
<!-- mybatis generator --> <dependency>
<dependency> <groupId>org.mybatis.generator</groupId>
<groupId>org.mybatis.generator</groupId> <artifactId>mybatis-generator-core</artifactId>
<artifactId>mybatis-generator-core</artifactId> <version>${mybatis-generator.version}</version>
<version>${mybatis-generator.version}</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>com.alibaba</groupId>
<groupId>com.alibaba</groupId> <artifactId>druid-spring-boot-starter</artifactId>
<artifactId>druid-spring-boot-starter</artifactId> <version>${druid.version}</version>
<version>${druid.version}</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>org.apache.httpcomponents</groupId>
<groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId>
<artifactId>httpclient</artifactId> </dependency>
</dependency>
<dependency>
<dependency> <groupId>org.apache.commons</groupId>
<groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId>
<artifactId>commons-collections4</artifactId> <version>${commons-collections4.vserion}</version>
<version>${commons-collections4.vserion}</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>com.alibaba</groupId>
<groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId>
<artifactId>fastjson</artifactId> <version>${fastjson.version}</version>
<version>${fastjson.version}</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>org.projectlombok</groupId>
<groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId>
<artifactId>lombok</artifactId> <optional>true</optional>
<optional>true</optional> </dependency>
</dependency>
</dependencies>
</dependencies>
<build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId>
<artifactId>spring-boot-maven-plugin</artifactId> <configuration>
</plugin> <mainClass>com.bailuntec.balancesheet.BalanceSheetApplication</mainClass>
</configuration>
<!--测试用例插件--> <executions>
<plugin> <execution>
<groupId>org.apache.maven.plugins</groupId> <goals>
<artifactId>maven-surefire-plugin</artifactId> <goal>repackage</goal>
<!-- 跳过测试--> </goals>
<configuration> </execution>
<skipTests>true</skipTests> </executions>
</configuration> </plugin>
</plugin>
<!--测试用例插件-->
</plugins> <plugin>
</build> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- 跳过测试-->
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
<!--配置资源文件目录-->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.yml</include>
</includes>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project> </project>
...@@ -326,7 +326,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -326,7 +326,7 @@ public class AutoTurnoverJob extends PointJob {
} }
dcAutoTurnover.setBailunSku(bailunSku); dcAutoTurnover.setBailunSku(bailunSku);
dcAutoTurnover.setWarehouseCode(warehouseCode); dcAutoTurnover.setWarehouseCode(warehouseCode);
dcAutoTurnover.setBailunSkuWarehouseCode(bailunSku + "_" + warehouseCode); dcAutoTurnover.setBailunSkuWarehouseCode(bailunSku + warehouseCode);
//写入仓库名 //写入仓库名
if (dcBaseWarehouse != null) { if (dcBaseWarehouse != null) {
dcAutoTurnover.setWarehouseName(dcBaseWarehouse.getWarehouseName()); dcAutoTurnover.setWarehouseName(dcBaseWarehouse.getWarehouseName());
......
...@@ -279,7 +279,7 @@ public class AutoTurnoverTest { ...@@ -279,7 +279,7 @@ public class AutoTurnoverTest {
DcBaseStockMapper dcBaseStockMapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class); DcBaseStockMapper dcBaseStockMapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
DcBaseQueueMapper dcBaseQueueMapper = SessionUtil.getSession().getMapper(DcBaseQueueMapper.class); DcBaseQueueMapper dcBaseQueueMapper = SessionUtil.getSession().getMapper(DcBaseQueueMapper.class);
List<DcBaseStock> dcBaseStockList = dcBaseStockMapper.selectTest(); List<DcBaseStock> dcBaseStockList = dcBaseStockMapper.selectNew(LocalDateTime.now().minusDays(1));
dcBaseStockList.forEach(dcBaseStock -> { dcBaseStockList.forEach(dcBaseStock -> {
DcBaseQueue dcBaseQueue = new DcBaseQueue(); DcBaseQueue dcBaseQueue = new DcBaseQueue();
...@@ -298,6 +298,7 @@ public class AutoTurnoverTest { ...@@ -298,6 +298,7 @@ public class AutoTurnoverTest {
SessionUtil.closeSession(); SessionUtil.closeSession();
} }
public void add(DcBaseStock dcBaseStock) { public void add(DcBaseStock dcBaseStock) {
dcBaseStock.setInWarehouse(2); dcBaseStock.setInWarehouse(2);
} }
......
...@@ -295,8 +295,6 @@ ...@@ -295,8 +295,6 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment