导出增加栈板id

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

@@ -662,6 +662,7 @@ public class StoragePosController {
                 List<List<String>> header = new ArrayList<>();
                 List<List<String>> header = new ArrayList<>();
                 Locale locale = request.getLocale();
                 Locale locale = request.getLocale();
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.barcode",locale,"条码编号")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.barcode",locale,"条码编号")));
+                header.add(Lists.newArrayList(MessageUtils.getText("",locale,"栈板id")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.partNumber",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.proDate",locale,"生产日期")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.expireDate",locale,"过期时间")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.expireDate",locale,"过期时间")));
@@ -692,6 +693,7 @@ public class StoragePosController {
 
 
                     List<Object> data = new ArrayList<>();
                     List<Object> data = new ArrayList<>();
                     data.add(pos.getBarcode().getBarcode());
                     data.add(pos.getBarcode().getBarcode());
+                    data.add(pos.getBarcode().getPalletId());
                     data.add(pos.getBarcode().getPartNumber());
                     data.add(pos.getBarcode().getPartNumber());
                     data.add(proDate);
                     data.add(proDate);
                     data.add(expireDate);
                     data.add(expireDate);

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -110,6 +110,7 @@ public class TaskController {
                 List<List<String>> headerList = new ArrayList<>();
                 List<List<String>> headerList = new ArrayList<>();
                 headerList.add(Lists.newArrayList("料件编号"));
                 headerList.add(Lists.newArrayList("料件编号"));
                 headerList.add(Lists.newArrayList("条码编号"));
                 headerList.add(Lists.newArrayList("条码编号"));
+                headerList.add(Lists.newArrayList("栈板id"));
                 headerList.add(Lists.newArrayList("料仓名称"));
                 headerList.add(Lists.newArrayList("料仓名称"));
                 headerList.add(Lists.newArrayList("数量"));
                 headerList.add(Lists.newArrayList("数量"));
                 headerList.add(Lists.newArrayList("类型"));
                 headerList.add(Lists.newArrayList("类型"));
@@ -130,6 +131,7 @@ public class TaskController {
                     List<Object> result = new ArrayList<>();
                     List<Object> result = new ArrayList<>();
                     result.add(dataLog.getPartNumber());
                     result.add(dataLog.getPartNumber());
                     result.add(dataLog.getBarcode());
                     result.add(dataLog.getBarcode());
+                    result.add(dataLog.getCartonId());
                     result.add(dataLog.getPosName()+" "+dataLog.getStorageName());
                     result.add(dataLog.getPosName()+" "+dataLog.getStorageName());
                     result.add(dataLog.getNum());
                     result.add(dataLog.getNum());
                     result.add(dataLog.getType() == 1 ? "入库" : "出库");
                     result.add(dataLog.getType() == 1 ? "入库" : "出库");