出入库记录页面增加一些查询条件

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java

@@ -58,12 +58,23 @@ public class TaskDto implements Serializable {
     private int num;
     private int num;
 
 
     /**
     /**
+     * 数量,入库为+出库为-
+     */
+    private int reelQty;
+
+    /**
      *  类型:入库OP.PUT_IN,出库OP.CHECKOUT
      *  类型:入库OP.PUT_IN,出库OP.CHECKOUT
      */
      */
     @ApiModelProperty("出入库类型")
     @ApiModelProperty("出入库类型")
     private int type;
     private int type;
 
 
     /**
     /**
+     * 详细出入库类型
+     */
+    @ApiModelProperty("详细出入库类型")
+    private int detailType;
+
+    /**
      * 状态:OP_STATUS
      * 状态:OP_STATUS
      */
      */
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")
@@ -160,4 +171,6 @@ public class TaskDto implements Serializable {
     @ApiModelProperty("是否是首盘料")
     @ApiModelProperty("是否是首盘料")
     private boolean firstReel=false;
     private boolean firstReel=false;
 
 
+
+
 }
 }

src/main/java/com/neotel/smfcore/core/system/rest/bean/mapstruct/TaskMapper.java

@@ -8,4 +8,5 @@ import org.mapstruct.ReportingPolicy;
 
 
 @Mapper(componentModel  = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
 @Mapper(componentModel  = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface TaskMapper extends BaseMapper<TaskDto, DataLog> {
 public interface TaskMapper extends BaseMapper<TaskDto, DataLog> {
+
 }
 }

src/main/java/com/neotel/smfcore/core/system/rest/bean/query/TaskQueryCondition.java

@@ -19,9 +19,25 @@ public class TaskQueryCondition {
     private String blurry;
     private String blurry;
 
 
     @QueryCondition
     @QueryCondition
-    @ApiModelProperty("条码编号")
+    @ApiModelProperty("唯一码")
     private String barcode;
     private String barcode;
 
 
+    @QueryCondition
+    @ApiModelProperty("单号")
+    private String sourceName;
+
+    @QueryCondition
+    @ApiModelProperty("料号")
+    private String partNumber;
+
+    @QueryCondition
+    @ApiModelProperty("批次")
+    private String batchInfo;
+
+    @QueryCondition
+    @ApiModelProperty("用户")
+    private String operator;
+
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private BetweenData<Date> updateDate;
     private BetweenData<Date> updateDate;

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -455,4 +455,23 @@ public class DataLog extends BasePo implements Serializable {
         }
         }
         return false;
         return false;
     }
     }
+
+    /**
+     * 获取详细出入库类型
+     */
+    public int getDetailType(){
+        if(type == OP.PUT_IN){
+            return inType;
+        }else{
+            return outType + 100;
+        }
+    }
+
+    public int getReelQty(){
+        if(type == OP.PUT_IN){
+            return num;
+        }else{
+            return 0 - num;
+        }
+    }
 }
 }