呼叫料箱导出增加物品详情

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

@@ -666,6 +666,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.storagePos.ware",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,"首次入库时间")));
@@ -682,6 +683,10 @@ public class StoragePosController {
                 List<StoragePos> storagePos = storagePosManager.findByQuery(query,pageable);
                 List<StoragePos> storagePos = storagePosManager.findByQuery(query,pageable);
                 for (StoragePos pos : storagePos) {
                 for (StoragePos pos : storagePos) {
 
 
+                    if(pos.getBarcode()==null){
+                        log.error(""+pos.getPosName()+"barcode为空，直接跳过不导出");
+                        continue;
+                    }
                     String proDate = pos.getBarcode().getProduceDate() == null ? "" : dateFormat.format(pos.getBarcode().getProduceDate());
                     String proDate = pos.getBarcode().getProduceDate() == null ? "" : dateFormat.format(pos.getBarcode().getProduceDate());
                     String expireDate = pos.getBarcode().getExpireDate() == null ? "" : dateFormat.format(pos.getBarcode().getExpireDate());
                     String expireDate = pos.getBarcode().getExpireDate() == null ? "" : dateFormat.format(pos.getBarcode().getExpireDate());
 
 
@@ -696,6 +701,18 @@ public class StoragePosController {
                     data.add(proDate);
                     data.add(proDate);
                     data.add(expireDate);
                     data.add(expireDate);
                     data.add(pos.getPosName());
                     data.add(pos.getPosName());
+                    //显示内容
+                    String wareInfo="";
+                    if(pos.getBarcode()!=null&&pos.getBarcode().getSubCodeList()!=null){
+                        for (Barcode subCode :
+                                pos.getBarcode().getSubCodeList()) {
+                            String pn=subCode.getPn()==null?"":subCode.getPn();
+                            wareInfo+=""+subCode.getBarcode()+"_"+subCode.getPartNumber()+"_"+pn+";";
+                        }
+                    }
+
+                    data.add(wareInfo);
+
                     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);