Commit 75b6df89 by huluobin

# 更新

parent 461e8ca5
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
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>
...@@ -97,6 +96,16 @@ ...@@ -97,6 +96,16 @@
<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>
<mainClass>com.bailuntec.balancesheet.BalanceSheetApplication</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<!--测试用例插件--> <!--测试用例插件-->
...@@ -108,8 +117,25 @@ ...@@ -108,8 +117,25 @@
<skipTests>true</skipTests> <skipTests>true</skipTests>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </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> </build>
......
...@@ -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