修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/HousePickingtableController.java

@@ -44,6 +44,12 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class HousePickingtableController extends JeecgController<HousePickingtable, HouseIPickingtableService> {
     @Autowired
     private HouseIPickingtableService pickingtableService;
+    @Autowired
+    private HousePickingReadyService housePickingReadyService;
+    @Autowired
+    private HouseIPickingtableService houseIPickingtableService;
+    @Autowired
+    private HousePickingFinshService housePickingFinshService;
 
     /**
      * 分页列表查询
@@ -67,6 +73,26 @@ public class HousePickingtableController extends JeecgController<HousePickingtab
         return Result.OK(pageList);
     }
 
+    @AutoLog(value = "待拣货产品明细-分页列表查询")
+    @ApiOperation(value = "待拣货产品明细-分页列表查询", notes = "待拣货产品明细-分页列表查询")
+    @GetMapping(value = "/ReadyList")
+    public Result<?> queryReadyList(@RequestParam(required = true) String id){
+        QueryWrapper<HousePickingReady> qw=new QueryWrapper<>();
+        qw.eq("house_pickingtable_id",id);
+        List<HousePickingReady> housePickingReadies = housePickingReadyService.getBaseMapper().selectList(qw);
+        return Result.OK(housePickingReadies);
+    }
+
+    @AutoLog(value = "已拣货产品明细-分页列表查询")
+    @ApiOperation(value = "已拣货产品明细-分页列表查询", notes = "已拣货产品明细-分页列表查询")
+    @GetMapping(value = "/FinshList")
+    public Result<?> queryFinshList(@RequestParam(required = true) String id){
+        QueryWrapper<HousePickingFinsh> qw=new QueryWrapper<>();
+        qw.eq("house_pickingtable_id",id);
+        List<HousePickingFinsh> housePickingReadies = housePickingFinshService.getBaseMapper().selectList(qw);
+        return Result.OK(housePickingReadies);
+    }
+
     /**
      * 添加
      *
@@ -181,12 +207,6 @@ public class HousePickingtableController extends JeecgController<HousePickingtab
     }
 
     /*-------------------------------------------------PDA端口-----------------------------------------------------*/
-    @Autowired
-    private HousePickingReadyService housePickingReadyService;
-    @Autowired
-    private HouseIPickingtableService houseIPickingtableService;
-    @Autowired
-    private HousePickingFinshService housePickingFinshService;
 
     /**
      * 测试专用

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/HousePickingtable.java

@@ -58,6 +58,30 @@ public class HousePickingtable implements Serializable {
     /**备注*/
     @ApiModelProperty(value = "备注")
     private String remarks;
+    /**销售单单号*/
+    @ApiModelProperty(value = "销售单单号")
+    private String salesOrderId;
+    /**领单时间*/
+    @ApiModelProperty(value = "领单时间")
+    private Date receivesTime;
+    /**拣货员*/
+    @ApiModelProperty(value = "拣货员")
+    private String picker;
+    /**扫描员*/
+    @ApiModelProperty(value = "扫描员")
+    private String scanner;
+    /**打印次数*/
+    @ApiModelProperty(value = "打印次数")
+    private Integer printingNumber;
+    /**打印时间*/
+    @ApiModelProperty(value = "打印时间")
+    private Date printingTime;
+    /**拣货完成时间*/
+    @ApiModelProperty(value = "拣货完成时间")
+    private Date finishTime;
+
+
+
 
 
 }