库存报表导出数据修改

src/main/java/com/neotel/smfcore/core/report/ReportController.java

@@ -266,24 +266,20 @@ public class ReportController {
     public void inventoryDownload(HttpServletResponse response, InventoryQueryCriteria criteria, Pageable pageable, Locale locale)throws IOException {
         List<InventoryItemDto> list = getInventory(criteria, pageable);
 
-        String partNumberStr = MessageUtils.getText("smfcore.inventory.partNumber", locale, "物料编号");
+        String partNumberStr = MessageUtils.getText("smfcore.inventory.pnNum", locale, "料号");
+        String pnStr = MessageUtils.getText("smfcore.inventory.pn", locale, "品名");
+        String gekouStr = MessageUtils.getText("smfcore.inventory.gekou", locale, "格口号");
         String countStr = MessageUtils.getText("smfcore.inventory.count", locale, "数量");
         String wareHouseCode = MessageUtils.getText("smfcore.inventory.wareHouseCode", locale, "库别");
-        String box = MessageUtils.getText("smfcore.inventory.box", locale, "料箱");
-//        String lockReelStr= MessageUtils.getText("smfcore.inventory.lockReel",locale,"锁定");
-//        String stockReelStr= MessageUtils.getText("smfcore.inventory.stockReel",locale,"库存");
-        String storageNameStr = MessageUtils.getText("smfcore.inventory.storageName", locale, "设备");
 
         List<Map<String, Object>> maps = new ArrayList<>();
         for (InventoryItemDto item : list) {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put(partNumberStr, item.getPartNumber());
+            map.put(pnStr, item.getPartname());
+            map.put(gekouStr, item.getGekouName());
             map.put(countStr, item.getStockCount());
-            map.put(wareHouseCode, "");
-            map.put(box, "");
-//            map.put(lockReelStr, item.getLockReel());
-//            map.put(stockReelStr, item.getStockReel());
-            map.put(storageNameStr, item.getStorageName());
+            map.put(wareHouseCode, item.getWareHouseCode());
             maps.add(map);
         }
         FileUtil.downloadExcel(maps, response);

src/main/resources/messages.properties

@@ -192,7 +192,7 @@ smfcore.storagePos.amount=\u6570\u91CF
 smfcore.storagePos.putInTime=\u9996\u6B21\u5165\u5E93\u65F6\u95F4
 smfcore.storagePos.putInDate=\u5165\u5E93\u65F6\u95F4
 smfcore.storagePos.existBarcode={0}\u5DF2\u5B58\u5728\u5E93\u4F4D{1}\u4E2D
-smfcore.inventory.partNumber=\u7269\u6599\u7F16\u53F7
+smfcore.inventory.partNumber=\u6599\u53F7
 smfcore.inventory.count=\u6570\u91CF
 smfcore.inventory.lockReel=\u9501\u5B9A
 smfcore.inventory.stockReel=\u5E93\u5B58

src/main/resources/messages_zh_CN.properties

@@ -186,7 +186,7 @@ smfcore.storagePos.lockName=\u5DE5\u5355\u53F7
 smfcore.storagePos.amount=\u6570\u91CF
 smfcore.storagePos.putInTime=\u9996\u6B21\u5165\u5E93\u65F6\u95F4
 smfcore.storagePos.putInDate=\u5165\u5E93\u65F6\u95F4
-smfcore.inventory.partNumber=\u7269\u6599\u7F16\u53F7
+smfcore.inventory.partNumber=\u6599\u53F7
 smfcore.inventory.count=\u6570\u91CF
 smfcore.inventory.lockReel=\u9501\u5B9A
 smfcore.inventory.stockReel=\u5E93\u5B58

src/main/resources/messages_zh_TW.properties

@@ -186,7 +186,7 @@ smfcore.storagePos.lockName=\u5DE5\u55AE\u865F
 smfcore.storagePos.amount=\u6578\u91CF
 smfcore.storagePos.putInTime=\u9996\u6B21\u5165\u5EAB\u6642\u9593
 smfcore.storagePos.putInDate=\u5165\u5EAB\u6642\u9593
-smfcore.inventory.partNumber=\u7269\u6599\u7DE8\u865F
+smfcore.inventory.partNumber=\u6599\u865F
 smfcore.inventory.count=\u6578\u91CF
 smfcore.inventory.lockReel=\u9396\u5B9A
 smfcore.inventory.stockReel=\u5EAB\u5B58