rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '惠信/develop' into develop

This commit is contained in:
曹鹏飞 2026-03-19 17:09:00 +08:00
parent ff36da82a6 69c1b163dd
commit 65ab089569
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinService.java
View File

@ -1,6 +1,7 @@
package com.nflg.wms.admin.service; package com.nflg.wms.admin.service;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.nflg.wms.common.pojo.dto.SAPSyncFromDTO; import com.nflg.wms.common.pojo.dto.SAPSyncFromDTO;
import com.nflg.wms.repository.service.IWmsStorageService; import com.nflg.wms.repository.service.IWmsStorageService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java
View File

@ -103,8 +103,12 @@ public class WmsStorageServiceImpl extends ServiceImpl<WmsStorageMapper, WmsStor
@Override @Override
public String getBinNo(String materialNo, String factoryNo, String warehouseNo) { public String getBinNo(String materialNo, String factoryNo, String warehouseNo) {
if (baseMapper.getBinNo(materialNo,factoryNo,warehouseNo)==null){
return "";
}else {
return baseMapper.getBinNo(materialNo, factoryNo, warehouseNo); return baseMapper.getBinNo(materialNo, factoryNo, warehouseNo);
} }
}
@Override @Override
public List<StorageVO> searchNonSync() { public List<StorageVO> searchNonSync() {