条码管理 增加栈板id 查询

src/main/java/com/neotel/smfcore/core/barcode/rest/BarcodeController.java

@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.csv.CsvReader;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.QueryHelp;
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeRuleDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeRuleDto;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.BarcodeMapper;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.BarcodeMapper;
@@ -71,8 +72,18 @@ public class BarcodeController {
     public PageData<BarcodeDto> query(BarcodeQueryCriteria criteria, Pageable pageable){
     public PageData<BarcodeDto> query(BarcodeQueryCriteria criteria, Pageable pageable){
         Query query= QueryHelp.getQuery(criteria);
         Query query= QueryHelp.getQuery(criteria);
         PageData<Barcode> barcodes=barcodeManager.findByPage(query,pageable);
         PageData<Barcode> barcodes=barcodeManager.findByPage(query,pageable);
+
+        List<BarcodeDto> newBarcodeDtos = new ArrayList<>();
+
         List<BarcodeDto> barcodeDtos=barcodeMapper.toDto(barcodes.getContent());
         List<BarcodeDto> barcodeDtos=barcodeMapper.toDto(barcodes.getContent());
-        return new PageData(barcodeDtos,barcodes.getTotalElements());
+        for (BarcodeDto dto : barcodeDtos) {
+            if (StringUtils.isEmpty(dto.getPalletId())){
+                dto.setPalletId(dto.getScanCartonId());
+            }
+            newBarcodeDtos.add(dto);
+        }
+
+        return new PageData(newBarcodeDtos,barcodes.getTotalElements());
     }
     }
     @ApiOperation("新增条码")
     @ApiOperation("新增条码")
     @PostMapping
     @PostMapping

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -286,6 +286,9 @@ public class BarcodeDto implements Serializable {
     @ApiModelProperty("栈板id")
     @ApiModelProperty("栈板id")
     private String palletId;
     private String palletId;
 
 
+    @ApiModelProperty("扫描的栈板id")
+    private String scanCartonId;
+
     @ApiModelProperty("标签id")
     @ApiModelProperty("标签id")
     private String labelId;
     private String labelId;
 }
 }

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/query/BarcodeQueryCriteria.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 
 @Data
 @Data
 public class BarcodeQueryCriteria {
 public class BarcodeQueryCriteria {
-    @QueryCondition(blurry = "partNumber,barcode,batch")
+    @QueryCondition(blurry = "partNumber,barcode,batch,scanCartonId,palletId")
     private String blurry;
     private String blurry;
 
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")