Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 76a758e3 由 LN
选项

bug修改

1 个父辈 1e0fedc2
内嵌 并排
正在显示 3 个修改的文件 包含 92 行增加 和 15 行删除
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java
...@@ -194,15 +194,43 @@ public class SelfAuditDeviceController { ...@@ -194,15 +194,43 @@ public class SelfAuditDeviceController {
StoragePos storagePos = storagePosManager.getByPosName(posName); StoragePos storagePos = storagePosManager.getByPosName(posName);
if (storagePos != null) { if (storagePos != null) {
try { try {
if(ObjectUtil.isNotEmpty(barcode)&&barcode.equals(actualBarcode)){ if(ObjectUtil.isNotEmpty(barcode) ){
Barcode barcode1=codeResolve.resolveOneValideBarcode(barcode); if(barcode.equals(actualBarcode)) {
if(barcode1!=null){ //物料一致
log.info("盘点入库完成，条码一致，自动生成入库任务，更新库位[" + storagePos.getPosName() + "]"); Barcode barcodeIn = codeResolve.resolveOneValideBarcode(barcode);
taskService.addTaskToFinished(storagePos,barcode1,"selfAudit"); if (barcodeIn != null) {
log.info("盘点入库完成，条码一致，自动生成入库任务，更新库位[" + storagePos.getPosName() + "]=[" + barcodeIn.getBarcode() + "]");
taskService.addTaskToFinished(storagePos, barcodeIn, "selfAudit");
}
}else if(ObjectUtil.isNotEmpty(actualBarcode)){
//物料不一致 优先实际条码入库
Barcode barcodeIn=codeResolve.resolveOneValideBarcode(actualBarcode);
if(barcodeIn!=null){
log.info("盘点入库完成，物料不一致，自动生成实际条码入库任务，更新库位[" + storagePos.getPosName() + "]=["+barcodeIn.getBarcode()+"]");
taskService.addTaskToFinished(storagePos,barcodeIn,"selfAudit");
}else{
barcodeIn=codeResolve.resolveOneValideBarcode(barcode);
if(barcodeIn!=null){
log.info("盘点入库完成，条码一致，实际条码解析失败，自动生成原条码入库任务，更新库位[" + storagePos.getPosName() + "]=["+barcodeIn.getBarcode()+"]");
taskService.addTaskToFinished(storagePos,barcodeIn,"selfAudit");
}
}
}else{
//库存有料，实际没料
}
} else if(ObjectUtil.isNotEmpty(actualBarcode)){
//库存没料，实际有料
//物料不一致 优先实际条码入库
Barcode barcodeIn=codeResolve.resolveOneValideBarcode(actualBarcode);
if(barcodeIn!=null){
log.info("盘点入库完成，库存没料，实际有料，自动生成实际条码入库任务，更新库位[" + storagePos.getPosName() + "]=["+barcodeIn.getBarcode()+"]");
taskService.addTaskToFinished(storagePos,barcodeIn,"selfAudit");
}else{
log.error("盘点入库完成，库存没料，实际有料，实际条码解析失败，生成入库任务失败，库位[" + storagePos.getPosName() + "]库存仍为空");
} }
} }
//TODO //TODO 如果原来有料，默认增加一条入库任务
} catch (Exception e) { } catch (Exception e) {
throw new ValidateException("smfcore.error", "出错{0}", new String[]{e.toString()}); throw new ValidateException("smfcore.error", "出错{0}", new String[]{e.toString()});
......
src/main/java/com/neotel/smfcore/custom/micron20031/MicronInventoryReportsController.java
...@@ -19,12 +19,15 @@ import com.neotel.smfcore.core.storage.rest.mapstruct.StoragePosMapper; ...@@ -19,12 +19,15 @@ import com.neotel.smfcore.core.storage.rest.mapstruct.StoragePosMapper;
import com.neotel.smfcore.core.storage.rest.query.InventoryQueryCriteria; import com.neotel.smfcore.core.storage.rest.query.InventoryQueryCriteria;
import com.neotel.smfcore.core.storage.rest.query.StoragePosFindCriteria; import com.neotel.smfcore.core.storage.rest.query.StoragePosFindCriteria;
import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager; import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.manager.IDataLogManager; import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
import com.neotel.smfcore.custom.micron20031.bean.MInOutType; import com.neotel.smfcore.custom.micron20031.bean.MInOutType;
import com.neotel.smfcore.custom.micron20031.bean.SpDailyLog; import com.neotel.smfcore.custom.micron20031.bean.SpDailyLog;
import com.neotel.smfcore.custom.micron20031.bean.dto.SpDailyLogDto; import com.neotel.smfcore.custom.micron20031.bean.dto.SpDailyLogDto;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import com.neotel.smfcore.security.service.manager.IGroupManager;
import com.neotel.smfcore.security.service.po.Group;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -68,6 +71,8 @@ public class MicronInventoryReportsController { ...@@ -68,6 +71,8 @@ public class MicronInventoryReportsController {
@Autowired @Autowired
private SelfAuditItemMapper selfAuditItemMapper; private SelfAuditItemMapper selfAuditItemMapper;
@Autowired
private final IGroupManager groupManager;
@ApiOperation("Inventory Chart(All) I2 :库存列表饼图报表") @ApiOperation("Inventory Chart(All) I2 :库存列表饼图报表")
@GetMapping(value = "/inventory") @GetMapping(value = "/inventory")
...@@ -233,6 +238,21 @@ public class MicronInventoryReportsController { ...@@ -233,6 +238,21 @@ public class MicronInventoryReportsController {
} }
PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable); PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent()); List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
for (StoragePosDto dto : StoragePosDtos
) {
Storage storage=dataCache.getStorageById(dto.getStorageId());
if(storage!=null){
dto.setStorageName(storage.getName());
if(ObjectUtil.isNotEmpty(storage.getGroupId())){
Group group=groupManager.get(storage.getGroupId());
if(group!=null){
dto.setGroupId(group.getId());
dto.setGroupName(group.getGroupName());
}
}
}
}
return new PageData(StoragePosDtos, pages.getTotalElements()); return new PageData(StoragePosDtos, pages.getTotalElements());
} }
......
src/main/java/com/neotel/smfcore/custom/micron20031/MicronPerformanceReportsController.java
...@@ -144,22 +144,51 @@ public class MicronPerformanceReportsController { ...@@ -144,22 +144,51 @@ public class MicronPerformanceReportsController {
} }
} }
List<OperatingTimeDto> result = new ArrayList<>(); List<OperatingTimeDto> result = new ArrayList<>();
for (String key : List<String> list=getDatesBetween(startTime,endTime);
dtoMap.keySet()) {
Date time = DateUtil.toDate(key, "yyyy-MM-dd");
if (time.after(startTime) && time.before(endTime)) {
OperatingTimeDto dto = dtoMap.get(key); for (String t :
list) {
OperatingTimeDto dto = dtoMap.getOrDefault(t,new OperatingTimeDto("","",t));
if(ObjectUtil.isNotEmpty(dto.getStorageId())){
Storage storage = dataCache.getStorageById(dto.getStorageId()); Storage storage = dataCache.getStorageById(dto.getStorageId());
dto.setCid(dto.getCid()); dto.setCid(dto.getCid());
dto.setStorageName(dto.getStorageName()); dto.setStorageName(dto.getStorageName());
result.add(dto);
} }
result.add(dto);
} }
// for (String key :
// dtoMap.keySet()) {
//
// Date time = DateUtil.toDate(key, "yyyy-MM-dd");
// if (time.after(startTime) && time.before(endTime)) {
//
// OperatingTimeDto dto = dtoMap.get(key);
// Storage storage = dataCache.getStorageById(dto.getStorageId());
// dto.setCid(dto.getCid());
// dto.setStorageName(dto.getStorageName());
// result.add(dto);
// }
// }
return result; return result;
} }
public static List<String> getDatesBetween(Date startDate, Date endDate) {
// DateTimeFormat formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
List<String> dates = new ArrayList<>();
while (!startDate.after(endDate)) {
dates.add(DateUtil.toDateString(startDate, "yyyy-MM-dd"));
Calendar calendar = Calendar.getInstance();
calendar.setTime(startDate);
calendar.add(Calendar.DATE, 1);
startDate = calendar.getTime();
}
return dates;
}
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!