1.导出增加其他字段

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

@@ -9,6 +9,7 @@ import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.core.barcode.bean.CodeBean;
+import com.neotel.smfcore.core.barcode.enums.BARCODE_STATUS;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.CodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.CodeMapper;
@@ -604,16 +605,19 @@ public class StoragePosController {
             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.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.putInDate",locale,"入库时间")));
-
+                header.add(Arrays.asList("条码编号"));
+                header.add(Arrays.asList("料号"));
+                //header.add(Arrays.asList("LabelId"));
+                header.add(Arrays.asList("状态"));
+                header.add(Arrays.asList("库别"));
+                header.add(Arrays.asList("批次"));
+                header.add(Arrays.asList("供应商"));
+                header.add(Arrays.asList("库位"));
+                header.add(Arrays.asList("DC"));
+                header.add(Arrays.asList("卷数"));
+                header.add(Arrays.asList("数量"));
+                header.add(Arrays.asList("首次入库时间"));
+                header.add(Arrays.asList("入库时间"));
                 return header;
             }
 
@@ -624,25 +628,40 @@ public class StoragePosController {
                 List<Map<String, Object>> list = new ArrayList<>();
                 List<StoragePos> storagePos = storagePosManager.findByQuery(query,pageable);
                 for (StoragePos pos : storagePos) {
+                    List<Object> data = new ArrayList<>();
+                    Barcode barcode = pos.getBarcode();
+                    if (barcode == null){
+                        continue;
+                    }
+                    data.add(barcode.getBarcode());
+                    data.add(barcode.getPartNumber());
+                    //data.add(barcode.getLabelId());
 
-                    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.isEmpty(putInTime)){
-                        putInTime=dateFormat.format(pos.getBarcode().getCreateDate());
+                    if (barcode.getStatus() == BARCODE_STATUS.IN_STORE){
+                        data.add("在库");
+                    } else {
+                        data.add("");
                     }
 
-                    List<Object> data = new ArrayList<>();
-                    data.add(pos.getBarcode().getBarcode());
-                    data.add(pos.getBarcode().getPartNumber());
-                    data.add(proDate);
-                    data.add(expireDate);
+                    data.add(barcode.getWarehouseCode());
+                    data.add(barcode.getBatch());
+                    data.add(barcode.getProvider());
                     data.add(pos.getPosName());
-                    data.add(pos.getBarcode().getLockName());
-                    data.add(pos.getBarcode().getAmount());
-                    data.add(putInTime);
-                    data.add(dateFormat.format(pos.getBarcode().getPutInDate()));
+                    data.add(barcode.getDateCode());
+                    data.add(1);
+                    data.add(barcode.getAmount());
+
+                    if (barcode.getPutInTime() != -1l){
+                        data.add(dateFormat.format(barcode.getPutInTime()));
+                    } else {
+                        data.add("");
+                    }
+
+                    if (barcode.getPutInDate() != null){
+                        data.add(dateFormat.format(barcode.getPutInDate()));
+                    } else {
+                        data.add("");
+                    }
                     dataList.add(data);
                 }
                 return dataList;
@@ -694,16 +713,11 @@ public class StoragePosController {
     @ApiOperation("解析出库条码")
     @PutMapping("/resolveCode/{blurry}")
     public CodeDto resolveCode(@PathVariable String blurry) {
-
-        String barcodeStr = blurry;
-        Barcode barcode = codeResolve.resolveCode(barcodeStr);
-        if (barcode == null) {
-            return null;
-        } else {
-            CodeDto dto = codeMapper.toDto(barcode);
-            log.info("resolveCode [" + barcodeStr + "]=[" + dto.toString() + "]");
-            return dto;
-        }
+        CodeDto codeDto = new CodeDto();
+        codeDto.setBarcode(blurry);
+        codeDto.setPartNumber(blurry);
+        codeDto.setFullCode(blurry);
+        return codeDto;
     }
 
     @ApiOperation("手动出库解析条码")