Browse Source

Merge branch 'dev' into pre-production

master
汤建军 10 months ago
parent
commit
abf2df0e52
  1. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  2. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@ -1289,16 +1289,16 @@
<if test=" param.warehouseEntryTimeEnd != null ">and DATE(k.earliestWarehouseEntryTime) &lt; <if test=" param.warehouseEntryTimeEnd != null ">and DATE(k.earliestWarehouseEntryTime) &lt;
#{param.warehouseEntryTimeEnd} #{param.warehouseEntryTimeEnd}
</if> </if>
<if test=" param.signingTimeStart != null ">and DATE(m.signing_time) &gt; <if test=" param.signingTimeStart != null ">and DATE(m.signing_time) &gt;=
#{param.signingTimeStart} #{param.signingTimeStart}
</if> </if>
<if test=" param.signingTimeEnd != null ">and DATE(m.signing_time) &lt; <if test=" param.signingTimeEnd != null ">and DATE(m.signing_time) &lt;=
#{param.signingTimeEnd} #{param.signingTimeEnd}
</if> </if>
<if test=" param.scanSigningTimeStart != null ">and DATE(j.scanSigningTime) &gt; <if test=" param.scanSigningTimeStart != null ">and DATE(j.scanSigningTime) &gt;=
#{param.scanSigningTimeStart} #{param.scanSigningTimeStart}
</if> </if>
<if test=" param.scanSigningTimeEnd != null ">and DATE(j.scanSigningTime) &lt; <if test=" param.scanSigningTimeEnd != null ">and DATE(j.scanSigningTime) &lt;=
#{param.scanSigningTimeEnd} #{param.scanSigningTimeEnd}
</if> </if>
</where> </where>

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@ -1992,6 +1992,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
// stockArticleEntity.setReservationStatus("10"); // stockArticleEntity.setReservationStatus("10");
// } // }
List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWarehouseList(); List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWarehouseList();
BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse();
List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
if (collect.size() > 1) { if (collect.size() > 1) {
@ -1999,6 +2000,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
} else if (collect.size() == 1) { } else if (collect.size() == 1) {
stockArticleEntity.setWarehouseId(collect.get(0)); stockArticleEntity.setWarehouseId(collect.get(0));
} }
if (Func.isNotEmpty(currentWarehouse)){
stockArticleEntity.setWarehouseIdList(null);
stockArticleEntity.setWarehouseId(currentWarehouse.getId());
}
IPage<DistributionSignforStockArticleVO> distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity); IPage<DistributionSignforStockArticleVO> distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity);
//处理创建人 //处理创建人
distributionStockArticleEntityIPage.getRecords().forEach(a -> { distributionStockArticleEntityIPage.getRecords().forEach(a -> {

Loading…
Cancel
Save