Browse Source

fix:修复测试问题

visual
pref_mail@163.com 4 months ago
parent
commit
470177c4f8
  1. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
  2. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  3. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

2
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@ -133,7 +133,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
@Override
public List<BasicdataWarehouseEntity> getWarehouseList() {
List<BasicdataWarehouseEntity> myWatchWarehouse = getMyWatchWarehouse();
if (myWatchWarehouse.size() > 0) {
if (!myWatchWarehouse.isEmpty()) {
return myWatchWarehouse;
}
List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList();

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@ -262,6 +262,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//收货单位-----根据三方商场找到对应的clientId
Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand);
if(!Objects.isNull(clientId)){
BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId);
if (!Objects.isNull(basicdataClientEntity)) {
openOrderVO.setConsigneeClientId(clientId);
@ -313,6 +314,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName());
}
}
}
//组装货物数据
List<AdvanceDetailGoodsVO> goodsList = new ArrayList<>();

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@ -480,7 +480,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
// 发车
if (ObjectUtil.equal(type, 1)) {
if (ObjectUtil.isEmpty(node)) {
if (ObjectUtil.equal(warehouseId, brand.getStartWarehouseId())) {
if (ObjectUtil.equal(warehouseId, Long.parseLong(brand.getStartWarehouseId()))) {
node = WorkNodeEnums.INITIAL_WAREHOUSE_DEPART;
} else {
node = WorkNodeEnums.TRANSFER_WAREHOUSE_DEPART;

Loading…
Cancel
Save