1.条码管理报表实时刷新,获取最新的栈板ID

2.库存报表输入料号、批次、库别,cartonID查询库存

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

@@ -77,7 +77,8 @@ public class BarcodeController {
 
         List<BarcodeDto> barcodeDtos=barcodeMapper.toDto(barcodes.getContent());
         for (BarcodeDto dto : barcodeDtos) {
-            if (StringUtils.isEmpty(dto.getPalletId())){
+            //如果栈板ID不为空,优先使用扫描的栈板ID
+            if (StringUtils.isNotEmpty(dto.getScanCartonId())){
                 dto.setPalletId(dto.getScanCartonId());
             }
             newBarcodeDtos.add(dto);

src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java

@@ -60,7 +60,7 @@ public class StoragePosFindCriteria {
     @QueryCondition(blurry = "barcode.partNumber")
     private String partNumber;
 
-    @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.subCodeList.partNumber")
+    @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.partNumber")
     private List<String> partNumberList;
 
     @QueryCondition(blurry = "barcode.memo")
@@ -71,7 +71,7 @@ public class StoragePosFindCriteria {
     private String batch;
 
 
-    @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.subCodeList.batch")
+    @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.batch")
     @ApiModelProperty("批次列表")
     private List<String> batchList;
 
@@ -95,7 +95,7 @@ public class StoragePosFindCriteria {
     @ApiModelProperty("工位名称")
     private String stationName;
 
-    @QueryCondition(propName = "barcode.subCodeList.warehouseCode")
+    @QueryCondition(propName = "barcode.warehouseCode")
     @ApiModelProperty("库别")
     private String warehouseCode;
 
@@ -111,6 +111,10 @@ public class StoragePosFindCriteria {
     @QueryCondition(type = QueryCondition.Type.IN,propName = "barcode.status")
     private List<Integer> boxStatusList;
 
+    @ApiModelProperty("栈板ID")
+    @QueryCondition(propName = "barcode.palletId")
+    private String palletId;
+
     public int getComponentType(){
         int componentType = getType();
         if (componentType != -1) {

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/LineController.java

@@ -371,6 +371,9 @@ public class LineController {
         }
 
         barcode.setScanCartonId(cartonId);
+        barcode.setCartonId("");
+        barcode.setPalletId("");
+        barcode.setOdn("");
         barcodeManager.saveBarcode(barcode);
         return ResultBean.newOkResult("");
     }