wms / wms4_zhongputaicang · Commits

Commit e4aeb1c0323172204e670c4cac6a05c9bbb50e0f

Authored by 肖超群
1 parent a86975ba

如果WMS和WCS库位状态不一致，不认为是异常

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
  View file @e4aeb1c
... ... @@ -7,7 +7,6 @@ import java.util.stream.Collectors;
7 7  
8 8 import javax.annotation.Resource;
9 9  
10   -import cn.hutool.core.collection.CollUtil;
11 10 import org.apache.commons.collections4.ListUtils;
12 11 import org.apache.shiro.util.CollectionUtils;
13 12 import org.jeecg.common.api.vo.Result;
... ... @@ -46,6 +45,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
46 45 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
47 46 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
48 47  
  48 +import cn.hutool.core.collection.CollUtil;
49 49 import cn.hutool.core.date.DatePattern;
50 50 import cn.hutool.core.date.DateUtil;
51 51 import cn.hutool.core.util.ObjectUtil;
... ... @@ -559,11 +559,11 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
559 559 compareLocationDto.setConsistencyStatus(0);
560 560 }
561 561 }
562   - if (!StringUtils.isEmpty(compareLocationDto.getLocationStatus()) || !StringUtils.isEmpty(compareLocationDto.getWcsLocationStatus())) {
563   - if (ObjectUtil.compare(compareLocationDto.getLocationStatus(), compareLocationDto.getWcsLocationStatus()) != 0) {
564   - compareLocationDto.setConsistencyStatus(0);
565   - }
566   - }
  562 +// if (!StringUtils.isEmpty(compareLocationDto.getLocationStatus()) || !StringUtils.isEmpty(compareLocationDto.getWcsLocationStatus())) {
  563 +// if (ObjectUtil.compare(compareLocationDto.getLocationStatus(), compareLocationDto.getWcsLocationStatus()) != 0) {
  564 +// compareLocationDto.setConsistencyStatus(0);
  565 +// }
  566 +// }
567 567 if (!StringUtils.isEmpty(location.getContainerCode())) {
568 568 if (ObjectUtil.compare(compareLocationDto.getLocationStatus(), compareLocationDto.getContainerStatus()) != 0) {
569 569 compareLocationDto.setConsistencyStatus(0);
... ...