src/main/java/com/zy/asrs/controller/OutController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OutController.java
@@ -71,7 +71,10 @@ Set<String> exist = new HashSet<>(); for (OrderDetl orderDetl : orderDetls) { double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D); BigDecimal a1 = new BigDecimal(orderDetl.getAnfme()); BigDecimal b1 = new BigDecimal(orderDetl.getQty()); Double c1 = a1.subtract(b1).doubleValue(); double issued = Optional.of( c1 ).orElse(0.0D); if (issued <= 0.0D) { continue; } List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner()); for (LocDetl locDetl : locDetls) { src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; @@ -177,7 +178,13 @@ } Double anfme = orderDetl.getAnfme(); Double workQty = orderDetl.getWorkQty(); if ( anfme - (workQty+combMat.getAnfme()) < 0) { BigDecimal a1 = new BigDecimal(orderDetl.getAnfme()); BigDecimal b1 = new BigDecimal(orderDetl.getWorkQty()); BigDecimal c1 = new BigDecimal(combMat.getAnfme()); double e1 = b1.add(c1).doubleValue(); BigDecimal f1 = new BigDecimal(e1); Double d1 = a1.subtract(f1).doubleValue(); if ( d1 < 0.0) { throw new CoolException("组托数量已超出订单需求量,请检查是否有其他的组托已完成"); } } src/main/resources/application.yml
@@ -14,7 +14,7 @@ enabled: false datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs url: jdbc:sqlserver://127.0.0.1:1433;databasename=stasrs #url: jdbc:sqlserver://127.0.0.1:1433;databasename=stasrs username: sa password: sa@123