uid出库导出时,增加设备

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -344,6 +344,7 @@ public class StoragePosController {
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.proDate",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.expireDate",locale,"过期时间")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.posName",locale,"库位号")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.posName",locale,"库位号")));
+                header.add(Lists.newArrayList(MessageUtils.getText("smfcore.inventory.storageName",locale,"设备")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.lockName",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.amount",locale,"数量")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"首次入库时间")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"首次入库时间")));
@@ -374,6 +375,12 @@ public class StoragePosController {
                     data.add(proDate);
                     data.add(proDate);
                     data.add(expireDate);
                     data.add(expireDate);
                     data.add(pos.getPosName());
                     data.add(pos.getPosName());
+                    Storage storage = dataCache.getStorageById(pos.getStorageId());
+                    if (storage != null){
+                        data.add(storage.getName());
+                    } else {
+                        data.add("");
+                    }
                     data.add(pos.getBarcode().getLockName());
                     data.add(pos.getBarcode().getLockName());
                     data.add(pos.getBarcode().getAmount());
                     data.add(pos.getBarcode().getAmount());
                     data.add(putInTime);
                     data.add(putInTime);