Skip to content

孙克 / smf-core

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

uid导出增加料盘和库位尺寸

1 个父辈 685de9c8
内嵌 并排
正在显示 6 个修改的文件 包含 117 行增加 和 5 行删除
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
......@@ -114,6 +114,97 @@ public class StoragePosController {
}
return new PageData(StoragePosDtos, pages.getTotalElements());
}
//
//
// @ApiOperation("导出查找出库列表")
// @GetMapping(value = "/download")
// @PreAuthorize("@el.check('checkOut')")
// public void download(HttpServletResponse response, StoragePosQueryCriteria criteria, Pageable pageable, HttpServletRequest request) throws IOException {
// if (criteria.getStorageIdList() != null && criteria.getStorageIdList().contains("0")) {
// criteria.setStorageIdList(null);
// }
// criteria.setStorageIdList(QueryHelp.getGroupStorageIdList(criteria.getStorageIdList()));
// String blurry = criteria.getBlurry();
// if(!Strings.isNullOrEmpty(blurry)){
// //去除库位中的SOxxxx
// blurry = blurry.substring(blurry.indexOf("-")+1);
// criteria.setBlurry(blurry);
// }
// Locale locale = request.getLocale();
//
// String enable=MessageUtils.getText("",locale,"是");
// String noEnable= MessageUtils.getText("",locale,"否");
// Query query = QueryHelp.getQuery(criteria);
// FileUtil.downloadExcel(query, pageable, response, new IExcelDownLoad() {
// @Override
// public List<List<String>> getHeader() {
// List<List<String>> header = new ArrayList<>();
// Locale locale = request.getLocale();
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.barcode",locale,"设备名称")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.partNumber",locale,"设备")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.proDate",locale,"列")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.expireDate",locale,"模组")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.batch",locale,"层")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.posName",locale,"槽位")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.lockName",locale,"是否可用")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.amount",locale,"条码")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"物料编号")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"料盘尺寸")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"直径")));
// header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"厚度")));
//
// return header;
// }
//
// @Override
// public List<List<Object>> getPageData(Query query, Pageable pageable) {
// List<List<Object>> dataList = new ArrayList<>();
// DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// List<Map<String, Object>> list = new ArrayList<>();
// PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
// List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
//
// for (int i=0;i<StoragePosDtos.size();i++){
// Storage storage=dataCache.getStorageById(StoragePosDtos.get(i).getStorageId());
// if(storage!=null){
// StoragePosDtos.get(i).setStorageName(storage.getName());
// }
// }
// for (StoragePosDto pos : StoragePosDtos) {
//
// String proDate = pos.getBarcode().getProduceDate() == null ? "" : dateFormat.format(pos.getBarcode().getProduceDate());
// String expireDate = pos.getBarcode().getExpireDate() == null ? "" : dateFormat.format(pos.getBarcode().getExpireDate());
//
// String putInTime = (pos.getBarcode().getPutInTime() == -1) ? "" : dateFormat.format(new Date(pos.getBarcode().getPutInTime()));
// if(ObjectUtil.isNotEmpty(putInTime)){
// putInTime=dateFormat.format(pos.getBarcode().getPutInDate());
// }
//
// List<Object> data = new ArrayList<>();
// data.add(pos.getStorageName());
// data.add(pos.getPosName());
// data.add(pos.getColumn());
// data.add(pos.getMagazine());
// data.add(pos.getLayer());
// data.add(pos.getSlot());
// data.add(pos.isEnabled()?(enable):noEnable);
// data.add(pos.getBarcode().getBarcode());
// data.add(pos.getBarcode().getPartNumber());
// data.add(proDate);
// data.add(expireDate);
// data.add(pos.getBarcode().getBatch());
// data.add(pos.getPosName());
// data.add(pos.getBarcode().getLockName());
// data.add(pos.getBarcode().getAmount());
// data.add(putInTime);
// data.add(dateFormat.format(pos.getBarcode().getPutInDate()));
// dataList.add(data);
// }
// return dataList;
// }
// });
// }
@ApiOperation("删除指定料仓所有库位")
......@@ -410,6 +501,9 @@ public class StoragePosController {
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.posName",locale,"库位号")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.lockName",locale,"工单号")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.amount",locale,"数量")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.plateSize",locale,"料盘尺寸")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.w",locale,"直径")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.h",locale,"厚度")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"首次入库时间")));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInDate",locale,"入库时间")));
......@@ -441,6 +535,9 @@ public class StoragePosController {
data.add(pos.getPosName());
data.add(pos.getBarcode().getLockName());
data.add(pos.getBarcode().getAmount());
data.add(pos.getBarcode().getPlateSize()+"X"+pos.getBarcode().getHeight());
data.add(pos.getW());
data.add(pos.getH());
data.add(putInTime);
data.add(dateFormat.format(pos.getBarcode().getPutInDate()));
dataList.add(data);
......
src/main/resources/messages.properties
......@@ -387,4 +387,7 @@ smfcore.duo.offline=\u8BBE\u5907{0}\u79BB\u7EBF
smfcore.msg.op.fail=\u64CD\u4F5C\u5931\u8D25
smfcore.equip.notExist=\u8BBE\u5907\u4E0D\u5B58\u5728
smfcore.order.finished=\u5DE5\u5355[{0}]\u7684\u4EFB\u52A1\u5DF2\u5168\u90E8\u5B8C\u6210
smfcore.spkanban=SP\u4EEA\u8868\u76D8
\ No newline at end of file
smfcore.spkanban=SP\u4EEA\u8868\u76D8
smfcore.storagePos.plateSize=\u6599\u76D8\u5C3A\u5BF8
smfcore.storagePos.w=\u76F4\u5F84
smfcore.storagePos.h=\u539A\u5EA6
\ No newline at end of file
src/main/resources/messages_en_US.properties
......@@ -378,4 +378,7 @@ smfcore.duo.offline=Equipment {0} offline
smfcore.msg.op.fail=failure of an operation
smfcore.equip.notExist=Device does not exist
smfcore.order.finished=workorder[{0}] has completed all of its tasks
smfcore.spkanban=SP Dash Board
\ No newline at end of file
smfcore.spkanban=SP Dash Board
smfcore.storagePos.plateSize=Detected Size
smfcore.storagePos.w=Diameter
smfcore.storagePos.h=Thickness
\ No newline at end of file
src/main/resources/messages_ja_JP.properties
......@@ -374,4 +374,7 @@ smfcore.duo.offline=\u8BBE\u5907{0}\u79BB\u7EBF
smfcore.msg.op.fail=\u64CD\u4F5C\u5931\u8D25
smfcore.equip.notExist=\u8BBE\u5907\u4E0D\u5B58\u5728
smfcore.order.finished=\u30EF\u30FC\u30AF\u30AA\u30FC\u30C0\u30FC[{0}]\u306E\u30BF\u30B9\u30AF\u306F\u3059\u3079\u3066\u5B8C\u4E86\u3057\u307E\u3057\u305F
smfcore.spkanban=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9
\ No newline at end of file
smfcore.spkanban=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9
smfcore.storagePos.plateSize=\u6599\u76D8\u5C3A\u5BF8
smfcore.storagePos.w=\u76F4\u5F84
smfcore.storagePos.h=\u539A\u3055
\ No newline at end of file
src/main/resources/messages_zh_CN.properties
......@@ -374,4 +374,7 @@ smfcore.duo.offline=\u8BBE\u5907{0}\u79BB\u7EBF
smfcore.msg.op.fail=\u64CD\u4F5C\u5931\u8D25
smfcore.equip.notExist=\u8BBE\u5907\u4E0D\u5B58\u5728
smfcore.order.finished=\u5DE5\u5355[{0}]\u7684\u4EFB\u52A1\u5DF2\u5168\u90E8\u5B8C\u6210
smfcore.spkanban=SP\u4EEA\u8868\u76D8
\ No newline at end of file
smfcore.spkanban=SP\u4EEA\u8868\u76D8
smfcore.storagePos.plateSize=\u6599\u76D8\u5C3A\u5BF8
smfcore.storagePos.w=\u76F4\u5F84
smfcore.storagePos.h=\u539A\u5EA6
\ No newline at end of file
src/main/resources/messages_zh_TW.properties
......@@ -374,4 +374,7 @@ smfcore.duo.offline=\u8A2D\u5099{0}\u96E2\u7DDA
smfcore.msg.op.fail=\u64CD\u4F5C\u5931\u6557
smfcore.equip.notExist=\u8A2D\u5099\u4E0D\u5B58\u5728
smfcore.order.finished=\u5DE5\u55AE[{0}]\u7684\u4EFB\u52D9\u5DF2\u5168\u90E8\u5B8C\u6210
smfcore.spkanban=SP\u5100\u9336\u76E4
\ No newline at end of file
smfcore.spkanban=SP\u5100\u9336\u76E4
smfcore.storagePos.plateSize=\u6599\u76D8\u5C3A\u5BF8
smfcore.storagePos.w=\u76F4\u5F84
smfcore.storagePos.h=\u539A\u5EA6
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!