1.1

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

+package org.jeecg.modules.iost.basedata.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.iost.basedata.entity.HouseLocationReady;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
+import org.jeecg.modules.iost.basedata.service.HouseILocationReadyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 入库单-待上架明细
+ * @Author: jeecg-boot
+ * @Date: 2021-07-27
+ * @Version: V1.0
+ */
+@Api(tags = "入库单-待上架明细")
+@RestController
+@RequestMapping("/basedata/locationready")
+@Slf4j
+public class HouseLocationReadyController extends JeecgController<HouseLocationReady, HouseILocationReadyService> {
+    @Autowired
+    private HouseILocationReadyService locationReadyService;
+
+    /**
+     * @param ready
+     * @return
+     */
+    @AutoLog(value = "入库单待上架明细-是否入库单产品")
+    @ApiOperation(value = "入库单待上架明细-是否入库单产品", notes = "入库单待上架明细-是否入库单产品")
+    @PostMapping(value = "/checkislocation")
+    public Result<Object> checkislocation(@RequestBody HouseLocationReady ready) {
+        Result<Object> result = new Result<>();
+        QueryWrapper<HouseLocationReady> locationReady = new QueryWrapper<HouseLocationReady>()
+                .eq("Warehousing_Id", ready.getWarehousingId());//入库单号
+        locationReady.eq("PurchaseId", ready.getPurchaseid());//采购单号
+        locationReady.eq("Productcode_Id", ready.getProductcodeId());//产品编码
+        locationReady.eq("Productname", ready.getProductname());//产品名称
+        locationReady.eq("Productnotes", ready.getProductnotes());//功效
+        List<HouseLocationReady> list = locationReadyService.getBaseMapper().selectList(locationReady);
+        System.out.println(list.size());
+        if (list.size() >= 1) {
+            HouseLocationReady houseLocationReady = list.get(0);
+            Integer productnumber1 = ready.getProductnumber();//预上架数
+            Integer waitingnumber = houseLocationReady.getWaitingnumber();//明细待上架数
+            Integer productnumber = houseLocationReady.getProductnumber();//已上架数
+            if (productnumber + productnumber1 <=waitingnumber) return result.OK("可入库");
+            else return result.error("超出入库单数量");
+        }
+        if (list == null||list.size()==0) {
+            return result.error("入库单不存在该产品");
+        }
+        result.OK("可入库");
+//        result.success("");
+        return result;
+    }
+
+}

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

@@ -21,137 +21,136 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 
 /**
-* @Description: 移库记录表
-* @Author: jeecg-boot
-* @Date:   2021-06-07
-* @Version: V1.0
-*/
-@Api(tags="移库记录表")
+ * @Description: 移库记录表
+ * @Author: jeecg-boot
+ * @Date: 2021-06-07
+ * @Version: V1.0
+ */
+@Api(tags = "移库记录表")
 @RestController
 @RequestMapping("/basedata/relocation")
 @Slf4j
 public class HouseRelocationController extends JeecgController<HouseRelocation, HouseIRelocationService> {
-   @Autowired
-   private HouseIRelocationService relocationService;
+    @Autowired
+    private HouseIRelocationService relocationService;
 
-   /**
-    * 分页列表查询
-    *
-    * @param relocation
-    * @param pageNo
-    * @param pageSize
-    * @param req
-    * @return
-    */
-   @AutoLog(value = "移库记录表-分页列表查询")
-   @ApiOperation(value="移库记录表-分页列表查询", notes="移库记录表-分页列表查询")
-   @GetMapping(value = "/list")
-   public Result<?> queryPageList(HouseRelocation relocation,
-                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                  HttpServletRequest req) {
-       QueryWrapper<HouseRelocation> queryWrapper = QueryGenerator.initQueryWrapper(relocation, req.getParameterMap());
-       Page<HouseRelocation> page = new Page<HouseRelocation>(pageNo, pageSize);
-       IPage<HouseRelocation> pageList = relocationService.page(page, queryWrapper);
-       return Result.OK(pageList);
-   }
+    /**
+     * 分页列表查询
+     *
+     * @param relocation
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "移库记录表-分页列表查询")
+    @ApiOperation(value = "移库记录表-分页列表查询", notes = "移库记录表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(HouseRelocation relocation,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<HouseRelocation> queryWrapper = QueryGenerator.initQueryWrapper(relocation, req.getParameterMap());
+        Page<HouseRelocation> page = new Page<HouseRelocation>(pageNo, pageSize);
+        IPage<HouseRelocation> pageList = relocationService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
 
-   /**
-    *   添加
-    *
-    * @param relocation
-    * @return
-    */
-   @AutoLog(value = "移库记录表-添加")
-   @ApiOperation(value="移库记录表-添加", notes="移库记录表-添加")
-   @PostMapping(value = "/add")
-   public Result<?> add(@RequestBody HouseRelocation relocation) {
-       relocationService.save(relocation);
-       return Result.OK("添加成功！");
-   }
+    /**
+     * 添加
+     *
+     * @param relocation
+     * @return
+     */
+    @AutoLog(value = "移库记录表-添加")
+    @ApiOperation(value = "移库记录表-添加", notes = "移库记录表-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody HouseRelocation relocation) {
+        relocationService.save(relocation);
+        return Result.OK("添加成功！");
+    }
 
 
+    /**
+     * 编辑
+     *
+     * @param relocation
+     * @return
+     */
+    @AutoLog(value = "移库记录表-编辑")
+    @ApiOperation(value = "移库记录表-编辑", notes = "移库记录表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody HouseRelocation relocation) {
+        relocationService.updateById(relocation);
+        return Result.OK("编辑成功!");
+    }
 
-   /**
-    *  编辑
-    *
-    * @param relocation
-    * @return
-    */
-   @AutoLog(value = "移库记录表-编辑")
-   @ApiOperation(value="移库记录表-编辑", notes="移库记录表-编辑")
-   @PutMapping(value = "/edit")
-   public Result<?> edit(@RequestBody HouseRelocation relocation) {
-       relocationService.updateById(relocation);
-       return Result.OK("编辑成功!");
-   }
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "移库记录表-通过id删除")
+    @ApiOperation(value = "移库记录表-通过id删除", notes = "移库记录表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        relocationService.removeById(id);
+        return Result.OK("删除成功!");
+    }
 
-   /**
-    *   通过id删除
-    *
-    * @param id
-    * @return
-    */
-   @AutoLog(value = "移库记录表-通过id删除")
-   @ApiOperation(value="移库记录表-通过id删除", notes="移库记录表-通过id删除")
-   @DeleteMapping(value = "/delete")
-   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-       relocationService.removeById(id);
-       return Result.OK("删除成功!");
-   }
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "移库记录表-批量删除")
+    @ApiOperation(value = "移库记录表-批量删除", notes = "移库记录表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.relocationService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
 
-   /**
-    *  批量删除
-    *
-    * @param ids
-    * @return
-    */
-   @AutoLog(value = "移库记录表-批量删除")
-   @ApiOperation(value="移库记录表-批量删除", notes="移库记录表-批量删除")
-   @DeleteMapping(value = "/deleteBatch")
-   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-       this.relocationService.removeByIds(Arrays.asList(ids.split(",")));
-       return Result.OK("批量删除成功!");
-   }
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "移库记录表-通过id查询")
+    @ApiOperation(value = "移库记录表-通过id查询", notes = "移库记录表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        HouseRelocation relocation = relocationService.getById(id);
+        if (relocation == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(relocation);
+    }
 
-   /**
-    * 通过id查询
-    *
-    * @param id
-    * @return
-    */
-   @AutoLog(value = "移库记录表-通过id查询")
-   @ApiOperation(value="移库记录表-通过id查询", notes="移库记录表-通过id查询")
-   @GetMapping(value = "/queryById")
-   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-       HouseRelocation relocation = relocationService.getById(id);
-       if(relocation==null) {
-           return Result.error("未找到对应数据");
-       }
-       return Result.OK(relocation);
-   }
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param relocation
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HouseRelocation relocation) {
+        return super.exportXls(request, relocation, HouseRelocation.class, "移库记录表");
+    }
 
-   /**
-   * 导出excel
-   *
-   * @param request
-   * @param relocation
-   */
-   @RequestMapping(value = "/exportXls")
-   public ModelAndView exportXls(HttpServletRequest request, HouseRelocation relocation) {
-       return super.exportXls(request, relocation, HouseRelocation.class, "移库记录表");
-   }
-
-   /**
+    /**
      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-       return super.importExcel(request, response, HouseRelocation.class);
-   }
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HouseRelocation.class);
+    }
 
 }

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

+package org.jeecg.modules.iost.basedata.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.iost.basedata.entity.HouseRelocation;
+import org.jeecg.modules.iost.basedata.entity.HouseSaleDetailed;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
+import org.jeecg.modules.iost.basedata.service.HouseIRelocationService;
+import org.jeecg.modules.iost.basedata.service.HouseISaleDetailedService;
+import org.jeecg.modules.iost.basedata.service.HouseIWarehousingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.swing.plaf.basic.BasicScrollPaneUI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 销售单-拣货产品明细
+ * @Author: jeecg-boot
+ * @Date: 2021-07-27
+ * @Version: V1.0
+ */
+@Api(tags = "销售单-拣货产品明细")
+@RestController
+@RequestMapping("/basedata/saledetailed")
+@Slf4j
+public class HouseSaleDetailedController extends JeecgController<HouseSaleDetailed, HouseISaleDetailedService> {
+    @Autowired
+    private HouseISaleDetailedService saleService;
+    @Autowired
+    private HouseIWarehousingService warehousingService;
+
+    /**
+     * 通过拣货单号查询
+     *
+     * @param Pickingid
+     * @return
+     */
+    @AutoLog(value = "拣货产品明细列表-通过拣货单号查询")
+    @ApiOperation(value = "拣货产品明细列表-通过拣货单号查询", notes = "拣货产品明细列表-通过拣货单号查询")
+    @GetMapping(value = "/querypositionid")
+    public Result<?> querypositionid(@RequestParam(name = "Pickingid", required = true) String Pickingid) {
+        List<HouseSaleDetailed> list = saleService.list(new QueryWrapper<HouseSaleDetailed>().eq("Pickingid", Pickingid));
+//        List<HouseSaleDetailed> list = saleService.getBaseMapper().selectList(new QueryWrapper<HouseSaleDetailed>().eq("Pickingid", Pickingid));
+
+        if (list == null || list.isEmpty()) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(list);
+    }
+    /**
+     * 通过拣货单号查询
+     *
+     * @param Pickingid
+     * @return
+     */
+    @AutoLog(value = "拣货产品明细列表-通过拣货单号查询")
+    @ApiOperation(value = "拣货产品明细列表-通过拣货单号查询", notes = "拣货产品明细列表-通过拣货单号查询")
+    @GetMapping(value = "/querypositionidT")
+    public Result<?> querypositionidT(@RequestParam(name = "Pickingid", required = true) String Pickingid) {
+        List<HouseSaleDetailed> list = saleService.list(new QueryWrapper<HouseSaleDetailed>().eq("Pickingid", Pickingid));
+//        List<HouseSaleDetailed> list = saleService.getBaseMapper().selectList(new QueryWrapper<HouseSaleDetailed>().eq("Pickingid", Pickingid));
+
+        List<Integer> houseWarehousingListIds = new ArrayList<Integer>();
+        for (HouseSaleDetailed houseSaleDetailed : list) {
+            houseWarehousingListIds.add(houseSaleDetailed.getWarehousingId());
+        }
+        List<HouseWarehousing> houseWarehousingList = new ArrayList<HouseWarehousing>();
+        if (!houseWarehousingListIds.isEmpty()) {
+            QueryWrapper<HouseWarehousing> queryWrapper = new QueryWrapper<>();
+            queryWrapper
+                    .in("id", houseWarehousingListIds);
+            houseWarehousingList = warehousingService.list(queryWrapper);
+        }
+
+        if (list == null || list.isEmpty()) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(list);
+    }
+    /**
+     * @param
+     * @return
+     */
+    @AutoLog(value = "")
+    @ApiOperation(value = "", notes = "")
+    @PutMapping(value = "/updatepicking")
+    @Transactional
+    public Result<?> updatepicking(@RequestBody Map<String,List<HouseSaleDetailed>> data) {
+        List<HouseSaleDetailed> saleDetailed = data.get("data");
+
+        boolean b = saleService.updateBatchById(saleDetailed);
+        List<HouseWarehousing> warehousings = new ArrayList<>();
+        for (HouseSaleDetailed houseSaleDetailed : saleDetailed) {
+            HouseWarehousing houseWarehousing = new HouseWarehousing(houseSaleDetailed.getWarehousingId(), houseSaleDetailed.getCompleteNum());
+            warehousings.add(houseWarehousing);
+        }
+        boolean b1 = warehousingService.updateBatchById(warehousings);
+        if (b&&b1){
+            return Result.OK("拣货成功!");
+        }
+        return Result.error("拣货失败!");
+    }
+}

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

@@ -11,11 +11,14 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
+import org.jeecg.modules.iost.basedata.service.HouseILocationReadyService;
 import org.jeecg.modules.iost.basedata.service.HouseIWarehouseService;
+import org.jeecg.modules.iost.basedata.vo.WareHouseInfoPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
@@ -34,7 +37,8 @@ import java.util.List;
 public class HouseWarehouseController extends JeecgController<HouseWarehouse, HouseIWarehouseService> {
    @Autowired
    private HouseIWarehouseService warehouseService;
-
+    @Autowired
+    private HouseILocationReadyService locationReadyService;
    /**
     * 分页列表查询
     *
@@ -141,12 +145,13 @@ public class HouseWarehouseController extends JeecgController<HouseWarehouse, Ho
     @GetMapping(value = "/querypositionid")
     public Result<?> querypositionid(@RequestParam(name="positionid",required=true) String positionid) {
         List<HouseWarehouse> list = warehouseService.getBaseMapper().selectList(new QueryWrapper<HouseWarehouse>().eq("PositionId",positionid));
-        if(list==null) {
+        if(list==null||list.size()==0) {
             return Result.error("未找到对应数据");
         }
         return Result.OK(list);
     }
 
+
     /**
      * 通过仓库查询仓位
      *

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -13,108 +14,150 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.iost.basedata.entity.HouseRelocation;
 import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
 import org.jeecg.modules.iost.basedata.service.HouseIWarehousingService;
+import org.jeecg.modules.iost.basedata.vo.HouseWarehousingPage;
+import org.jeecg.modules.iost.basedata.vo.HouseWarehousingVOs;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
-* @Description: 入库订单列表
-* @Author: jeecg-boot
-* @Date:   2021-06-04
-* @Version: V1.0
-*/
-@Api(tags="入库订单列表")
+ * @Description: 入库订单列表
+ * @Author: jeecg-boot
+ * @Date: 2021-06-04
+ * @Version: V1.0
+ */
+@Api(tags = "入库订单列表")
 @RestController
 @RequestMapping("/basedata/warehousing")
 @Slf4j
 public class HouseWarehousingController extends JeecgController<HouseWarehousing, HouseIWarehousingService> {
-   @Autowired
-   private HouseIWarehousingService warehousingService;
-
-   /**
-    * 分页列表查询
-    *
-    * @param warehousing
-    * @param pageNo
-    * @param pageSize
-    * @param req
-    * @return
-    */
-   @AutoLog(value = "入库订单列表-分页列表查询")
-   @ApiOperation(value="入库订单列表-分页列表查询", notes="入库订单列表-分页列表查询")
-   @GetMapping(value = "/list")
-   public Result<?> queryPageList(HouseWarehousing warehousing,
-                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                  HttpServletRequest req) {
-       QueryWrapper<HouseWarehousing> queryWrapper = QueryGenerator.initQueryWrapper(warehousing, req.getParameterMap());
-       Page<HouseWarehousing> page = new Page<HouseWarehousing>(pageNo, pageSize);
-       IPage<HouseWarehousing> pageList = warehousingService.page(page, queryWrapper);
-       return Result.OK(pageList);
-   }
+    @Autowired
+    private HouseIWarehousingService warehousingService;
+
 
     /**
-     *   条件查询所有信息
+     * 分页列表查询
      *
-     * @param cangku
-     * @param cangwei
+     * @param warehousing
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-分页列表查询")
+    @ApiOperation(value = "入库订单列表-分页列表查询", notes = "入库订单列表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(HouseWarehousing warehousing,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<HouseWarehousing> queryWrapper = QueryGenerator.initQueryWrapper(warehousing, req.getParameterMap());
+        Page<HouseWarehousing> page = new Page<HouseWarehousing>(pageNo, pageSize);
+        IPage<HouseWarehousing> pageList = warehousingService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 条件查询所有信息
+     *
+     * @param warehouseId
+     * @param positionId
      * @return
      */
     @AutoLog(value = "入库订单列表-条件查询所有信息")
-    @ApiOperation(value="入库订单列表-条件查询所有信息", notes="入库订单列表-条件查询所有信息")
-    @PostMapping(value = "/seletlist")
-    public Result<?> seletlist(@RequestBody String cangku,@RequestBody String cangwei,@RequestBody String productcodeid,@RequestBody String productname) {
-       List<HouseWarehousing> list = warehousingService.selectlist(cangku,cangwei,productcodeid,productname);
-       return Result.OK(list);
+    @ApiOperation(value = "入库订单列表-条件查询所有信息", notes = "入库订单列表-条件查询所有信息")
+    @GetMapping(value = "/seletlist")
+    public Result<?> seletlist(@RequestParam(required = false) String warehouseId, @RequestParam(required = false) String positionId, @RequestParam(required = false) String productcodeId, @RequestParam(required = false) String productname) {
+        List<HouseWarehousing> list = warehousingService.selectlist(warehouseId, positionId, productcodeId, productname);
+        return Result.OK(list);
     }
 
 
-   /**
-    *   添加
-    *
-    * @param warehousing
-    * @return
-    */
-   @AutoLog(value = "入库订单列表-添加")
-   @ApiOperation(value="入库订单列表-添加", notes="入库订单列表-添加")
-   @PostMapping(value = "/add")
-   public Result<?> add(@RequestBody HouseWarehousing warehousing) {
-       warehousingService.save(warehousing);
-       return Result.OK("添加成功！");
-   }
-
-   /**
-    *  编辑
-    *
-    * @param warehousing
-    * @return
-    */
-   @AutoLog(value = "入库订单列表-编辑")
-   @ApiOperation(value="入库订单列表-编辑", notes="入库订单列表-编辑")
-   @PutMapping(value = "/edit")
-   public Result<?> edit(@RequestBody HouseWarehousing warehousing) {
-       warehousingService.updateById(warehousing);
-       return Result.OK("编辑成功!");
-   }
+    /**
+     * 添加
+     *
+     * @param warehousing
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-添加")
+    @ApiOperation(value = "入库订单列表-添加", notes = "入库订单列表-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody HouseWarehousing warehousing) {
+        warehousingService.save(warehousing);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 添加
+     *
+     * @param warehousingpage
+     * @return
+     */
+    @AutoLog(value = "入库定位集合-添加")
+    @ApiOperation(value = "入库定位集合-添加", notes = "入库定位集合-添加")
+    @PostMapping(value = "/addList")
+    public Result<?> addList(@RequestBody List<HouseWarehousing> warehousingpage) {
+
+//        for (HouseWarehousing houseWarehousing : warehousingpage) {
+//            warehousingService.save(houseWarehousing);
+//        }
+//        warehousingService.saveBatch(warehousingpage,warehousingpage.size());
+        warehousingService.saveBatch(warehousingpage);
+        return Result.OK("添加成功！");
+    }
 
     /**
-     *  移动产品数量
+     * 添加
+     *
+     * @param warehousingpage
+     * @return
+     */
+    @AutoLog(value = "入库定位集合-添加")
+    @ApiOperation(value = "入库定位集合-添加", notes = "入库定位集合-添加")
+    @PostMapping(value = "/addLists")
+    public Result<?> addList(@RequestBody List<HouseWarehousing> warehousingpage, @RequestBody HouseWarehousing map) {
+
+        for (HouseWarehousing houseWarehousing : warehousingpage) {
+            houseWarehousing.setWorkNo(map.getWorkNo()).setRealname(map.getRealname());
+            warehousingService.save(houseWarehousing);
+        }
+//        warehousingService.saveBatch(warehousing);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param warehousing
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-编辑")
+    @ApiOperation(value = "入库订单列表-编辑", notes = "入库订单列表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody HouseWarehousing warehousing) {
+        warehousingService.updateById(warehousing);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 移动产品数量
      *
      * @param warehousing
      * @return
      */
     @AutoLog(value = "入库订单列表-移动产品数量")
-    @ApiOperation(value="入库订单列表-移动产品数量", notes="入库订单列表-移动产品数量")
+    @ApiOperation(value = "入库订单列表-移动产品数量", notes = "入库订单列表-移动产品数量")
     @PutMapping(value = "/updateshuliang")
     public Result<?> updateshuliang(@RequestBody HouseWarehousing warehousing, @RequestBody HouseRelocation re) {
-        int shengyu = warehousing.getProductnumber()-re.getProductnumber();
+        int shengyu = warehousing.getProductnumber() - re.getProductnumber();
         warehousingService.updateById(warehousing);
-        if(shengyu!=0){
+        if (shengyu != 0) {
             warehousing.setProductnumber(shengyu);
             warehousingService.save(warehousing);
         }
@@ -122,72 +165,125 @@ public class HouseWarehousingController extends JeecgController<HouseWarehousing
         return Result.OK("移动成功!");
     }
 
-   /**
-    *   通过id删除
-    *
-    * @param id
-    * @return
-    */
-   @AutoLog(value = "入库订单列表-通过id删除")
-   @ApiOperation(value="入库订单列表-通过id删除", notes="入库订单列表-通过id删除")
-   @DeleteMapping(value = "/delete")
-   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-       warehousingService.removeById(id);
-       return Result.OK("删除成功!");
-   }
-
-   /**
-    *  批量删除
-    *
-    * @param ids
-    * @return
-    */
-   @AutoLog(value = "入库订单列表-批量删除")
-   @ApiOperation(value="入库订单列表-批量删除", notes="入库订单列表-批量删除")
-   @DeleteMapping(value = "/deleteBatch")
-   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-       this.warehousingService.removeByIds(Arrays.asList(ids.split(",")));
-       return Result.OK("批量删除成功!");
-   }
-
-   /**
-    * 通过id查询
-    *
-    * @param id
-    * @return
-    */
-   @AutoLog(value = "入库订单列表-通过id查询")
-   @ApiOperation(value="入库订单列表-通过id查询", notes="入库订单列表-通过id查询")
-   @GetMapping(value = "/queryById")
-   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-       HouseWarehousing warehousing = warehousingService.getById(id);
-       if(warehousing==null) {
-           return Result.error("未找到对应数据");
-       }
-       return Result.OK(warehousing);
-   }
+    /**
+     * 通过仓位查询
+     *
+     * @param positionid
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-通过仓位查询")
+    @ApiOperation(value = "入库订单列表-通过仓位查询", notes = "入库订单列表-通过仓位查询")
+    @GetMapping(value = "/querypositionid")
+    public Result<?> querypositionid(@RequestParam(name = "positionid", required = true) String positionid) {
+        List<HouseWarehousing> list = warehousingService.getBaseMapper().selectList(new QueryWrapper<HouseWarehousing>().eq("Position_Id", positionid));
+        if (list == null || list.size() == 0) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(list);
+    }
+
+    /**
+     * 移动产品数量
+     *
+     * @param
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-移库")
+    @ApiOperation(value = "入库订单列表-移库", notes = "入库订单列表-移库")
+    @PutMapping(value = "/updatemove")
+    @Transactional
+    public Result<?> updatemove(@RequestBody HouseWarehousingVOs dapage) {
+        List<HouseWarehousingPage> data;
+        String newPositionId;
+        data = dapage.getData();
+        newPositionId = dapage.getFormData().get("newPositionId");
+
+        for (HouseWarehousingPage warehousing : data) {
+            warehousing.setPositionmove(newPositionId);
+            if (warehousing.getMoveNum() > 0) {//移库数量大于0，进入
+                int shengyu = warehousing.getProductnumber() - warehousing.getMoveNum();//移库后剩余数量
+                if (shengyu != 0) {//剩余大于0
+                    //筛选需要的数据vo组装转换为entity实体
+                    warehousingService.updateById(new HouseWarehousing(warehousing.getId(), shengyu));//修改为剩余数量
+                    warehousingService.save(new HouseWarehousing(warehousing).setPositionId(warehousing.getPositionmove()));//新增数据 数量为移库数量
+                } else if (shengyu == 0) {//剩余==0 修改原定位
+                    //筛选需要的数据vo转换为entity
+                    warehousingService.updateById(new HouseWarehousing()
+                            .setId(warehousing.getId())
+                            .setPositionId(warehousing.getPositionmove()));//修改原定位
+                }
+            }
+        }
+        return Result.OK("移动成功!");
+    }
+
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-通过id删除")
+    @ApiOperation(value = "入库订单列表-通过id删除", notes = "入库订单列表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        warehousingService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-批量删除")
+    @ApiOperation(value = "入库订单列表-批量删除", notes = "入库订单列表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.warehousingService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "入库订单列表-通过id查询")
+    @ApiOperation(value = "入库订单列表-通过id查询", notes = "入库订单列表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        HouseWarehousing warehousing = warehousingService.getById(id);
+        if (warehousing == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(warehousing);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param warehousing
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HouseWarehousing warehousing) {
+        return super.exportXls(request, warehousing, HouseWarehousing.class, "入库订单列表");
+    }
 
     /**
-   * 导出excel
-   *
-   * @param request
-   * @param warehousing
-   */
-   @RequestMapping(value = "/exportXls")
-   public ModelAndView exportXls(HttpServletRequest request, HouseWarehousing warehousing) {
-       return super.exportXls(request, warehousing, HouseWarehousing.class, "入库订单列表");
-   }
-
-   /**
      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-       return super.importExcel(request, response, HouseWarehousing.class);
-   }
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HouseWarehousing.class);
+    }
 
 }

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

+package org.jeecg.modules.iost.basedata.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
+import org.jeecg.modules.iost.basedata.service.HouseIWarehousingLocationService;
+import org.jeecg.modules.iost.basedata.service.HouseIWorkPickingService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: 入库订单
+ * @Author: jeecg-boot
+ * @Date: 2021-07-21
+ * @Version: V1.0
+ */
+@Api(tags = "入库订单")
+@RestController
+@RequestMapping("/basedata/warehousinglocation")
+@Slf4j
+public class HouseWarehousingLocationController extends JeecgController<HouseWarehousingLocation, HouseIWarehousingLocationService> {
+
+}

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

+package org.jeecg.modules.iost.basedata.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkPicking;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkScanning;
+import org.jeecg.modules.iost.basedata.service.HouseIWorkPickingService;
+import org.jeecg.modules.iost.basedata.service.HouseIWorkScanningService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 员工拣货工作量列表
+ * @Author: jeecg-boot
+ * @Date: 2021-07-22
+ * @Version: V1.0
+ */
+@Api(tags = "员工拣货工作量列表")
+@RestController
+@RequestMapping("/basedata/workpicking")
+@Slf4j
+public class HouseWorkPickingController extends JeecgController<HouseWorkPicking, HouseIWorkPickingService> {
+    @Autowired
+    private HouseIWorkPickingService workPickingService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param workPicking
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "员工拣货工作量列表-分页列表查询")
+    @ApiOperation(value = "员工拣货工作量列表-分页列表查询", notes = "员工拣货工作量列表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(HouseWorkPicking workPicking,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<HouseWorkPicking> queryWrapper = QueryGenerator.initQueryWrapper(workPicking, req.getParameterMap());
+        Page<HouseWorkPicking> page = new Page<HouseWorkPicking>(pageNo, pageSize);
+        IPage<HouseWorkPicking> pageList = workPickingService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "员工拣货工作量列表-通过id查询")
+    @ApiOperation(value = "员工拣货工作量列表-通过id查询", notes = "员工拣货工作量列表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        HouseWorkPicking workPicking = workPickingService.getById(id);
+        if (workPicking == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(workPicking);
+    }
+
+    /**
+     * 添加
+     *
+     * @param workPicking
+     * @return
+     */
+    @AutoLog(value = "员工拣货工作量列表-添加")
+    @ApiOperation(value = "员工拣货工作量列表-添加", notes = "员工拣货工作量列表-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody HouseWorkPicking workPicking) {
+        workPickingService.save(workPicking);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "员工拣货工作量列表-通过id删除")
+    @ApiOperation(value = "员工拣货工作量列表-通过id删除", notes = "员工拣货工作量列表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        workPickingService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "员工拣货工作量列表-批量删除")
+    @ApiOperation(value = "员工拣货工作量列表-批量删除", notes = "员工拣货工作量列表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.workPickingService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param workPicking
+     * @return
+     */
+    @AutoLog(value = "员工拣货工作量列表-编辑")
+    @ApiOperation(value = "员工拣货工作量列表-编辑", notes = "员工拣货工作量列表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody HouseWorkPicking workPicking) {
+        workPickingService.updateById(workPicking);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param workPicking
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HouseWorkPicking workPicking) {
+        return super.exportXls(request, workPicking, HouseWorkPicking.class, "员工拣货工作量信息");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HouseWorkPicking.class);
+    }
+}

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

+package org.jeecg.modules.iost.basedata.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkScanning;
+import org.jeecg.modules.iost.basedata.service.HouseIWorkScanningService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 员工扫描工作量列表
+ * @Author: jeecg-boot
+ * @Date: 2021-07-21
+ * @Version: V1.0
+ */
+@Api(tags = "员工扫描工作量列表")
+@RestController
+@RequestMapping("/basedata/workscanning")
+@Slf4j
+public class HouseWorkScanningController extends JeecgController<HouseWorkScanning, HouseIWorkScanningService> {
+    @Autowired
+    private HouseIWorkScanningService workScanningService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param workScanning
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "员工扫描工作量列表-分页列表查询")
+    @ApiOperation(value = "员工扫描工作量列表-分页列表查询", notes = "员工扫描工作量列表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(HouseWorkScanning workScanning,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<HouseWorkScanning> queryWrapper = QueryGenerator.initQueryWrapper(workScanning, req.getParameterMap());
+        Page<HouseWorkScanning> page = new Page<HouseWorkScanning>(pageNo, pageSize);
+        IPage<HouseWorkScanning> pageList = workScanningService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "员工扫描工作量列表-通过id查询")
+    @ApiOperation(value = "员工扫描工作量列表-通过id查询", notes = "员工扫描工作量列表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        HouseWorkScanning workScanning = workScanningService.getById(id);
+        if (workScanning == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(workScanning);
+    }
+
+    /**
+     * 添加
+     *
+     * @param warehousing
+     * @return
+     */
+    @AutoLog(value = "员工扫描工作量列表-添加")
+    @ApiOperation(value = "员工扫描工作量列表-添加", notes = "员工扫描工作量列表-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody HouseWorkScanning warehousing) {
+        workScanningService.save(warehousing);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "员工扫描工作量列表-通过id删除")
+    @ApiOperation(value = "员工扫描工作量列表-通过id删除", notes = "员工扫描工作量列表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        workScanningService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "员工扫描工作量列表-批量删除")
+    @ApiOperation(value = "员工扫描工作量列表-批量删除", notes = "员工扫描工作量列表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.workScanningService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param workScanning
+     * @return
+     */
+    @AutoLog(value = "员工扫描工作量列表-编辑")
+    @ApiOperation(value = "员工扫描工作量列表-编辑", notes = "员工扫描工作量列表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody HouseWorkScanning workScanning) {
+        workScanningService.updateById(workScanning);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param workScanning
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HouseWorkScanning workScanning) {
+        return super.exportXls(request, workScanning, HouseWorkScanning.class, "员工扫描工作量信息");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HouseWorkScanning.class);
+    }
+}

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

+package org.jeecg.modules.iost.basedata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.iost.basedata.vo.WareHouseInfoPage;
+import org.jeecg.modules.iost.basedata.vo.WareInfoPage;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags="条码信息测试")
+@RestController
+@RequestMapping("/infoTest")
+@Slf4j
+public class InfoTest {
+
+    /**
+     * 通过仓位查询Test
+     *
+     * @param
+     * @return
+     */
+    @AutoLog(value = "仓库列表-通过仓位查询")
+    @ApiOperation(value="仓库列表-通过仓位查询", notes="仓库列表-通过仓位查询")
+    @GetMapping(value = "/wareHouseInfo")
+    public WareHouseInfoPage wareHouseInfo() {
+
+        return new WareHouseInfoPage().setWareHouseName("深圳仓库").setWareHouseNo("A001");
+    }
+
+    @AutoLog(value = "采购产品订单表-通过采购订单号查询")
+    @ApiOperation(value="采购产品订单表-通过采购订单号查询", notes="采购产品订单表-通过采购订单号查询")
+    @GetMapping(value = "/wareInfo")
+    public WareInfoPage WareInfo() {
+        return new WareInfoPage()
+                .setWareName("茶壶")
+                .setWareNo(new String[]{"CH001"})
+                .setWarePurpose(new String[]{"喝茶","装饰"})
+                .setWareNum(100);
+    }
+}

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

@@ -32,7 +32,7 @@ public class HouseLingjianhuo implements Serializable {
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private int id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -53,17 +53,17 @@ public class HouseLingjianhuo implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 	/**拣货单号*/
-	@Excel(name = "拣货单号", width = 15)
+    @Excel(name = "拣货单号", width = 15)
     @ApiModelProperty(value = "拣货单号")
     private String pickingid;
-	/**员工编号*/
-	@Excel(name = "员工编号", width = 15)
+    /**员工编号*/
+    @Excel(name = "员工编号", width = 15)
     @ApiModelProperty(value = "员工编号")
-    private String yuanggongbianhao;
-	/**员工名称*/
+    private String employeeNumber;
+    /**员工名称*/
 	@Excel(name = "员工名称", width = 15)
     @ApiModelProperty(value = "员工名称")
-    private String yuangongname;
+    private String employeeName;
 	/**扫描时间*/
 	@Excel(name = "扫描时间", width = 15)
     @ApiModelProperty(value = "扫描时间")

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

+package org.jeecg.modules.iost.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 入库订单列表
+ * @Author: jeecg-boot
+ * @Date: 2021-06-04
+ * @Version: V1.0
+ */
+@Data
+@NoArgsConstructor
+@TableName("house_location_ready")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "house_location_ready对象", description = "入库单待上架明细")
+public class HouseLocationReady implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private int id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**
+     * 入库订单编号
+     */
+    @Excel(name = "入库订单编号", width = 15)
+    @ApiModelProperty(value = "入库订单编号")
+    private Integer warehousingId;
+
+    /**采购顶单号*/
+    @Excel(name = "采购顶单号", width = 15)
+    @ApiModelProperty(value = "采购顶单号")
+    private Integer purchaseid;
+    /**
+     * 产品编码
+     */
+    @Excel(name = "产品编码", width = 15)
+    @ApiModelProperty(value = "产品编码")
+    private String productcodeId;
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+    private String productname;
+
+    /**
+     * 功效
+     */
+    @Excel(name = "功效", width = 15)
+    @ApiModelProperty(value = "功效")
+    private String productnotes;
+
+    /**
+     * 待上架数量
+     */
+    @Excel(name = "待上架数量", width = 15)
+    @ApiModelProperty(value = "待上架数量")
+    private Integer waitingnumber;
+    /**
+     * 已上架数量
+     */
+    @Excel(name = "已上架数量", width = 15)
+    @ApiModelProperty(value = "已上架数量")
+    private Integer productnumber;
+
+    public HouseLocationReady(int id, int productnumber) {
+        this.id = id;
+        this.productnumber = productnumber;
+    }
+
+
+}

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

@@ -16,7 +16,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: 采购产品订单表
+ * @Description: 采购产品订单表明细
  * @Author: jeecg-boot
  * @Date:   2021-06-04
  * @Version: V1.0
@@ -25,7 +25,7 @@ import java.util.Date;
 @TableName("house_product")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="product对象", description="采购产品订单表")
+@ApiModel(value="product对象", description="采购产品订单表明细")
 public class HouseProduct implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -72,4 +72,10 @@ public class HouseProduct implements Serializable {
 	@Excel(name = "功效", width = 15)
     @ApiModelProperty(value = "功效")
     private String productnotes;
+
+    /**出单数量*/
+    @Excel(name = "出单数量", width = 15)
+    @ApiModelProperty(value = "出单数量")
+    private String qutquantity;
+
 }

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

@@ -32,7 +32,7 @@ public class HouseRelocation implements Serializable {
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private int id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -83,9 +83,9 @@ public class HouseRelocation implements Serializable {
 	/**员工编号*/
 	@Excel(name = "员工编号", width = 15)
     @ApiModelProperty(value = "员工编号")
-    private Integer yuangongbianhao;
+    private Integer workNo;
 	/**员工姓名*/
 	@Excel(name = "员工姓名", width = 15)
     @ApiModelProperty(value = "员工姓名")
-    private String yuangongname;
+    private String realname;
 }

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

+package org.jeecg.modules.iost.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 仓库列表
+ * @Author: jeecg-boot
+ * @Date:   2021-06-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("house_sale_detailed")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="house_sale对象", description="销售单列表")
+public class HouseSaleDetailed implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private int id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**拣货单号*/
+    @Excel(name = "拣货单号", width = 15)
+    @ApiModelProperty(value = "拣货单号")
+    private String pickingid;
+    /**库存定位类码*/
+    @Excel(name = "库存定位类码", width = 15)
+    @ApiModelProperty(value = "库存定位类码")
+    private Integer warehousingId;
+    /**
+     * 产品编码
+     */
+    @Excel(name = "产品编码", width = 15)
+    @ApiModelProperty(value = "产品编码")
+    private String productcodeId;
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+    private String productname;
+    /**
+     * 功效
+     */
+    @Excel(name = "功效", width = 15)
+    @ApiModelProperty(value = "功效")
+    private String productnotes;
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库", width = 15)
+    @ApiModelProperty(value = "仓库")
+    private String warehouseId;
+    /**
+     * 仓位
+     */
+    @Excel(name = "仓位", width = 15)
+    @ApiModelProperty(value = "仓位")
+    private String positionId;
+    /**
+     * 需求数量
+     */
+    @Excel(name = "需求数量", width = 15)
+    @ApiModelProperty(value = "需求数量")
+    private Integer demandNum;
+
+    /**
+     * 完成数量
+     */
+    @Excel(name = "完成数量", width = 15)
+    @ApiModelProperty(value = "完成数量z")
+    private Integer completeNum;
+}

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

@@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.iost.basedata.vo.HouseWarehousingPage;
+//import org.jeecg.modules.iost.basedata.vo.HouseWarehousingVO;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -18,66 +22,152 @@ import java.util.Date;
 /**
  * @Description: 入库订单列表
  * @Author: jeecg-boot
- * @Date:   2021-06-04
+ * @Date: 2021-06-04
  * @Version: V1.0
  */
 @Data
+@NoArgsConstructor
 @TableName("house_warehousing")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="warehousing对象", description="入库订单列表")
+@ApiModel(value = "warehousing对象", description = "入库订单列表")
 public class HouseWarehousing implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private String id;
-	/**创建人*/
+    private int id;
+    /**
+     * 创建人
+     */
     @ApiModelProperty(value = "创建人")
     private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @ApiModelProperty(value = "更新人")
     private String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
-	/**入库订单编号*/
-	@Excel(name = "入库订单编号", width = 15)
+
+    /**
+     * 采购顶单号
+     */
+    @Excel(name = "采购顶单号", width = 15)
+    @ApiModelProperty(value = "采购顶单号")
+    private Integer purchaseid;
+    /**
+     * 入库订单编号
+     */
+    @Excel(name = "入库订单编号", width = 15)
     @ApiModelProperty(value = "入库订单编号")
-    private Integer warehousingid;
-	/**仓库*/
-	@Excel(name = "仓库", width = 15)
+    private Integer warehousingId;
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库", width = 15)
     @ApiModelProperty(value = "仓库")
-    private String warehouseid;
-	/**仓位*/
-	@Excel(name = "仓位", width = 15)
+    private String warehouseId;
+    /**
+     * 仓位
+     */
+    @Excel(name = "仓位", width = 15)
     @ApiModelProperty(value = "仓位")
-    private String positionid;
-	/**产品编码*/
-	@Excel(name = "产品编码", width = 15)
+    private String positionId;
+    /**
+     * 产品编码
+     */
+    @Excel(name = "产品编码", width = 15)
     @ApiModelProperty(value = "产品编码")
-    private String productcodeid;
-	/**产品名称*/
-	@Excel(name = "产品名称", width = 15)
+    private String productcodeId;
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称", width = 15)
     @ApiModelProperty(value = "产品名称")
     private String productname;
-	/**数量*/
-	@Excel(name = "数量", width = 15)
+    /**
+     * 数量
+     */
+    @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
     private Integer productnumber;
-	/**功效*/
-	@Excel(name = "功效", width = 15)
+    /**
+     * 功效
+     */
+    @Excel(name = "功效", width = 15)
     @ApiModelProperty(value = "功效")
     private String productnotes;
+
+    /**
+     * 工号
+     */
+    @Excel(name = "工号", width = 15)
+    @ApiModelProperty(value = "工号")
+    private String workNo;
+    /**
+     * 操作员名称
+     */
+    @Excel(name = "操作员名称", width = 15)
+    @ApiModelProperty(value = "操作员名称")
+    private String realname;
+    /**
+     * 上架时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "上架时间")
+    private Date shelftime;
+
+    public HouseWarehousing(int id, int productnumber) {
+        this.id = id;
+        this.productnumber = productnumber;
+    }
+
+//    public HouseWarehousing(HouseWarehousingVO houseWarehousingVO,String positionmove,int productnumbermove) {
+//        this.warehousingId = houseWarehousingVO.getWarehousingid();//入库订单编号
+//        this.warehouseId = houseWarehousingVO.getWarehouseid();//仓库
+//        this.positionId = positionmove;//仓位
+//        this.productcodeId = houseWarehousingVO.getProductcodeid();//产品编码
+//        this.productname = houseWarehousingVO.getProductname();//产品名称
+//        this.productnumber = productnumbermove;//数量
+//        this.productnotes = houseWarehousingVO.getProductnotes();//功效
+//    }
+
+    public HouseWarehousing(HouseWarehousingPage houseWarehousingPage) {
+        this.warehousingId = houseWarehousingPage.getWarehousingId();//入库订单编号
+        this.purchaseid = houseWarehousingPage.getPurchaseid();//采购顶单号
+
+        this.warehouseId = houseWarehousingPage.getProductmove();//仓库
+        if (this.warehouseId.equals("") || this.warehouseId == null) {
+            this.warehouseId = houseWarehousingPage.getWarehouseId();
+        }
+        this.positionId = houseWarehousingPage.getPositionmove();//仓位
+        this.productcodeId = houseWarehousingPage.getProductcodeId();//产品编码
+        this.productname = houseWarehousingPage.getProductname();//产品名称
+        this.productnumber = houseWarehousingPage.getMoveNum();//数量
+        this.productnotes = houseWarehousingPage.getProductnotes();//功效
+        this.workNo = houseWarehousingPage.getWorkNo();
+        this.realname = houseWarehousingPage.getRealname();
+    }
 }

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

+package org.jeecg.modules.iost.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 入库定位单
+ * @Author: jeecg-boot
+ * @Date: 2021-07-27
+ * @Version: V1.0
+ */
+@Data
+@NoArgsConstructor
+@TableName("house_warehousing_location")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "warehousing_location对象", description = "入库定位单")
+public class HouseWarehousingLocation implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private int id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**
+     * 生成时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "生成时间")
+    private Date generationtime;
+}

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

+package org.jeecg.modules.iost.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 员工拣货工作量统计表
+ * @Author: jeecg-boot
+ * @Date: 2021-07-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("house_workpicking")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "员工拣货工作量", description = "员工拣货工作量统计")
+public class HouseWorkPicking implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+     /**员工编号*/
+    @ApiModelProperty(value = "员工编号")
+    private String Yuanggongid;
+
+    /**员工名称*/
+    @ApiModelProperty(value = "员工名称")
+    private String Yuangongname;
+
+    /**订单号*/
+    @ApiModelProperty(value = "订单号")
+    private Long Saleid;
+
+    /**条码数/行数*/
+    @ApiModelProperty(value = "条码数/行数")
+    private int Hangshu;
+
+    /**件数*/
+    @ApiModelProperty(value = "件数")
+    private int Jianshu;
+
+    /**开始时间*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开始时间")
+    private Date Kaishi;
+
+    /**拣货完成时间*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "拣货完成时间")
+    private Date Wancheng;
+
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    private String Beizhu;
+
+
+}

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

+package org.jeecg.modules.iost.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 员工扫描工作量统计表
+ * @Author: jeecg-boot
+ * @Date: 2021-07-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("house_workscanning")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "员工扫描工作量对象", description = "员工扫描工作量统计")
+public class HouseWorkScanning implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+     /**员工编号*/
+    @ApiModelProperty(value = "员工编号")
+    private String Yuanggongid;
+
+    /**员工名称*/
+    @ApiModelProperty(value = "员工名称")
+    private String Yuangongname;
+
+    /**订单号*/
+    @ApiModelProperty(value = "订单号")
+    private Long Saleid;
+
+    /**条码数/行数*/
+    @ApiModelProperty(value = "条码数/行数")
+    private int Hangshu;
+
+    /**支数*/
+    @ApiModelProperty(value = "支数")
+    private int count;
+
+    /**开始时间*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开始时间")
+    private Date Kaishi;
+
+    /**扫描完成时间*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "扫描完成时间")
+    private Date Wancheng;
+
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    private String Beizhu;
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/HouseLocationReadyMapper.java

+package org.jeecg.modules.iost.basedata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.iost.basedata.entity.HouseLocationReady;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * @Description: 入库定位单-待上架明细
+ * @Author: jeecg-boot
+ * @Date: 2021-07-27
+ * @Version: V1.0
+ */
+@Repository
+public interface HouseLocationReadyMapper extends BaseMapper<HouseLocationReady> {
+
+    List<HouseLocationReady> getCheckIsLocation(HouseLocationReady houseLocationReady);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/HouseSaleDetailedMapper.java

+package org.jeecg.modules.iost.basedata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.iost.basedata.entity.HouseSaleDetailed;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
+
+/**
+ * @Description: 銷售單
+ * @Author: jeecg-boot
+ * @Date:   2021-07-27
+ * @Version: V1.0
+ */
+public interface HouseSaleDetailedMapper extends BaseMapper<HouseSaleDetailed> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/HouseWarehousingLocationMapper.java

+package org.jeecg.modules.iost.basedata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
+
+/**
+ * @Description: 入库定位单
+ * @Author: jeecg-boot
+ * @Date:   2021-07-27
+ * @Version: V1.0
+ */
+public interface HouseWarehousingLocationMapper extends BaseMapper<HouseWarehousingLocation> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/HouseWarehousingMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.iost.basedata.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @Date:   2021-06-04
  * @Version: V1.0
  */
+@Repository
 public interface HouseWarehousingMapper extends BaseMapper<HouseWarehousing> {
 
     public List<HouseWarehousing> selectlist(@Param("cangku") String cangku, @Param("cangwei") String cangwei, @Param("productcodeid") String productcodeid, @Param("productname") String productname);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/HouseWorkPickingMapper.java

+package org.jeecg.modules.iost.basedata.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkPicking;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkScanning;
+
+
+/**
+ * @Description:
+ * @Author: jeecg-boot
+ * @Date:   2021-07-22
+ * @Version: V1.0
+ */
+public interface HouseWorkPickingMapper extends BaseMapper<HouseWorkPicking> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/HouseWorkScanningMapper.java

+package org.jeecg.modules.iost.basedata.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkScanning;
+
+
+/**
+ * @Description:
+ * @Author: jeecg-boot
+ * @Date:   2021-07-21
+ * @Version: V1.0
+ */
+public interface HouseWorkScanningMapper extends BaseMapper<HouseWorkScanning> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HouseLocationReadyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.iost.basedata.mapper.HouseLocationReadyMapper">
+    <!-- 检查 -->
+    <select id="getCheckIsLocation" parameterType="org.jeecg.modules.iost.basedata.entity.HouseLocationReady" resultType="org.jeecg.modules.iost.basedata.entity.HouseLocationReady">
+		select Waitingnumber,Productnumber from  house_location_ready  where Warehousing_Id = #{warehousingId}
+		and
+		PurchaseId = #{purchaseid} and
+		Productcode_Id = #{productcodeId} and
+		Productname = #{productname} and
+		Productnotes = #{productnotes}
+	</select>
+</mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HouseSaleDetailedMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.iost.basedata.mapper.HouseSaleDetailedMapper">
+
+</mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HouseWarehouseMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.inandoutofstorage.basedata.mapper.WarehouseMapper">
+<mapper namespace="org.jeecg.modules.iost.basedata.mapper.HouseWarehouseMapper">
 
 </mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HouseWarehousingLocationMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.iost.basedata.mapper.HouseWarehousingLocationMapper">
+
+</mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HouseWarehousingMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.inandoutofstorage.basedata.mapper.WarehousingMapper">
+<mapper namespace="org.jeecg.modules.iost.basedata.mapper.HouseWarehousingMapper">
 
-    <select id="selectlist" parameterType="java.lang.String" resultType="org.jeecg.modules.iost.basedata.entity.HouseWarehousing">
+    <select id="selectlist" parameterType="java.lang.String"
+            resultType="org.jeecg.modules.iost.basedata.entity.HouseWarehousing">
         SELECT *
-        FROM  warehousing
+        FROM house_warehousing
         <where>
             <if test="cangku != null">
-            and WarehouseId = #{cangku}
+                and Warehouse_Id = #{cangku}
             </if>
             <if test="cangwei != null">
-            and PositionId = #{cangwei}
+                and Position_Id = #{cangwei}
             </if>
             <if test="productcodeid != null">
-                and ProductcodeId = #{productcodeid}
+                and Productcode_Id = #{productcodeid}
             </if>
             <if test="productname != null">
                 and Productname = #{productname}
             </if>
         </where>
-        ORDER BY WarehouseId</select>
+        ORDER BY Warehouse_Id
+    </select>
 
+    <update id="editById" parameterType="org.jeecg.modules.iost.basedata.entity.HouseWarehousing">
+        update warehousing
+        <set>
+            <if test="null != productnumber and productnumber >0">productnumber=#{productnumber},</if>
+            <if test="null != positionid and positionid !=''">positionid=#{positionid},</if>
+        </set>
+        where id=#{id}
+    </update>
 </mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HouseWorkPickingMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.inandoutofstorage.basedata.mapper.HouseWorkPickingMapper">
+
+</mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HouseWorkScanningMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.inandoutofstorage.basedata.mapper.HouseWorkScanningMapper">
+
+</mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseILocationReadyService.java

+package org.jeecg.modules.iost.basedata.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.iost.basedata.entity.HouseLocationReady;
+
+import java.util.List;
+
+/**
+ * @Description: 入库定位单-待上架明细
+ * @Author: jeecg-boot
+ * @Date:   2021-07-27
+ * @Version: V1.0
+ */
+public interface HouseILocationReadyService extends IService<HouseLocationReady> {
+    List<HouseLocationReady> getCheckIsLocation(HouseLocationReady houseLocationReady);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseISaleDetailedService.java

+package org.jeecg.modules.iost.basedata.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.iost.basedata.entity.HouseProduct;
+import org.jeecg.modules.iost.basedata.entity.HouseSaleDetailed;
+
+/**
+ * @Description: 销售
+ * @Author: jeecg-boot
+ * @Date:   2021-08-02
+ * @Version: V1.0
+ */
+public interface HouseISaleDetailedService extends IService<HouseSaleDetailed> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseIWarehousingLocationService.java

+package org.jeecg.modules.iost.basedata.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
+
+/**
+ * @Description: 入库定位单
+ * @Author: jeecg-boot
+ * @Date:   2021-07-27
+ * @Version: V1.0
+ */
+public interface HouseIWarehousingLocationService extends IService<HouseWarehousingLocation> {
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseIWorkPickingService.java

+package org.jeecg.modules.iost.basedata.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkPicking;
+
+
+/**
+ * @Description: 员工拣货工作量统计
+ * @Author: jeecg-boot
+ * @Date:   2021-07-22
+ * @Version: V1.0
+ */
+public interface HouseIWorkPickingService extends IService<HouseWorkPicking> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseIWorkScanningService.java

+package org.jeecg.modules.iost.basedata.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import org.jeecg.modules.iost.basedata.entity.HouseWorkScanning;
+
+/**
+ * @Description: 员工扫描工作量统计
+ * @Author: jeecg-boot
+ * @Date:   2021-07-21
+ * @Version: V1.0
+ */
+public interface HouseIWorkScanningService extends IService<HouseWorkScanning> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseLocationReadyServiceImpl.java

+package org.jeecg.modules.iost.basedata.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.iost.basedata.entity.HouseLocationReady;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
+import org.jeecg.modules.iost.basedata.mapper.HouseLocationReadyMapper;
+import org.jeecg.modules.iost.basedata.mapper.HouseWarehousingLocationMapper;
+import org.jeecg.modules.iost.basedata.service.HouseILocationReadyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * @Description: 入库单-待上架明细
+ * @Author: jeecg-boot
+ * @Date: 2021-07-27
+ * @Version: V1.0
+ */
+@Service
+public class HouseLocationReadyServiceImpl extends ServiceImpl<HouseLocationReadyMapper, HouseLocationReady> implements HouseILocationReadyService {
+    @Autowired
+    private HouseLocationReadyMapper locationReadyMapper;
+
+    public List<HouseLocationReady> getCheckIsLocation(HouseLocationReady houseLocationReady) {
+        return locationReadyMapper.getCheckIsLocation(houseLocationReady);
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseSaleDetailedServiceImpl.java

+package org.jeecg.modules.iost.basedata.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.iost.basedata.entity.HouseSaleDetailed;
+import org.jeecg.modules.iost.basedata.mapper.HouseSaleDetailedMapper;
+import org.jeecg.modules.iost.basedata.service.HouseISaleDetailedService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 销售单表
+ * @Author: jeecg-boot
+ * @Date:   2021-06-08
+ * @Version: V1.0
+ */
+@Service
+public class HouseSaleDetailedServiceImpl extends ServiceImpl<HouseSaleDetailedMapper, HouseSaleDetailed> implements HouseISaleDetailedService {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseWarehousingLocationServiceImpl.java

+package org.jeecg.modules.iost.basedata.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousingLocation;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkPicking;
+import org.jeecg.modules.iost.basedata.mapper.HouseWarehousingLocationMapper;
+import org.jeecg.modules.iost.basedata.mapper.HouseWorkPickingMapper;
+import org.jeecg.modules.iost.basedata.service.HouseIWarehousingLocationService;
+import org.jeecg.modules.iost.basedata.service.HouseIWorkPickingService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: 入库订单
+ * @Author: jeecg-boot
+ * @Date: 2021-07-22
+ * @Version: V1.0
+ */
+@Service
+public class HouseWarehousingLocationServiceImpl extends ServiceImpl<HouseWarehousingLocationMapper, HouseWarehousingLocation> implements HouseIWarehousingLocationService {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseWarehousingServiceImpl.java

@@ -18,9 +18,9 @@ import java.util.List;
 @Service
 public class HouseWarehousingServiceImpl extends ServiceImpl<HouseWarehousingMapper, HouseWarehousing> implements HouseIWarehousingService {
     @Autowired
-    HouseIWarehousingService houseIWarehousingService;
+    HouseWarehousingMapper houseWarehousingMapper;
     @Override
     public List<HouseWarehousing> selectlist(String cangku, String cangwei, String productcodeid, String productname) {
-        return houseIWarehousingService.selectlist(cangku,cangwei,productcodeid,productname);
+        return houseWarehousingMapper.selectlist(cangku,cangwei,productcodeid,productname);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseWorkPickingServiceServiceImpl.java

+package org.jeecg.modules.iost.basedata.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkPicking;
+
+import org.jeecg.modules.iost.basedata.mapper.HouseWorkPickingMapper;
+
+import org.jeecg.modules.iost.basedata.service.HouseIWorkPickingService;
+
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: 员工拣货工作量统计
+ * @Author: jeecg-boot
+ * @Date: 2021-07-22
+ * @Version: V1.0
+ */
+@Service
+public class HouseWorkPickingServiceServiceImpl extends ServiceImpl<HouseWorkPickingMapper, HouseWorkPicking> implements HouseIWorkPickingService {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseWorkScanningServiceImpl.java

+package org.jeecg.modules.iost.basedata.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.iost.basedata.entity.HouseWorkScanning;
+import org.jeecg.modules.iost.basedata.mapper.HouseWorkScanningMapper;
+import org.jeecg.modules.iost.basedata.service.HouseIWorkScanningService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: 员工扫描工作量统计
+ * @Author: jeecg-boot
+ * @Date: 2021-07-21
+ * @Version: V1.0
+ */
+@Service
+public class HouseWorkScanningServiceImpl extends ServiceImpl<HouseWorkScanningMapper, HouseWorkScanning> implements HouseIWorkScanningService {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/vo/HouseSaleDetailedVo.java

+package org.jeecg.modules.iost.basedata.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 仓库列表
+ * @Author: jeecg-boot
+ * @Date:   2021-06-04
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="house_sale对象", description="销售单列表")
+public class HouseSaleDetailedVo  {
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**拣货单号*/
+    @Excel(name = "拣货单号", width = 15)
+    @ApiModelProperty(value = "拣货单号")
+    private String pickingid;
+    /**库存定位类码*/
+    @Excel(name = "库存定位类码", width = 15)
+    @ApiModelProperty(value = "库存定位类码")
+    private Integer warehousingId;
+    /**
+     * 产品编码
+     */
+    @Excel(name = "产品编码", width = 15)
+    @ApiModelProperty(value = "产品编码")
+    private String productcodeId;
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+    private String productname;
+    /**
+     * 功效
+     */
+    @Excel(name = "功效", width = 15)
+    @ApiModelProperty(value = "功效")
+    private String productnotes;
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库", width = 15)
+    @ApiModelProperty(value = "仓库")
+    private String warehouseId;
+    /**
+     * 仓位
+     */
+    @Excel(name = "仓位", width = 15)
+    @ApiModelProperty(value = "仓位")
+    private String positionId;
+    /**
+     * 需求数量
+     */
+    @Excel(name = "需求数量", width = 15)
+    @ApiModelProperty(value = "需求数量")
+    private Integer demandNum;
+
+    /**
+     * 完成数量
+     */
+    @Excel(name = "完成数量", width = 15)
+    @ApiModelProperty(value = "完成数量")
+    private Integer completeNum;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/vo/HouseWarehousingPage.java

+package org.jeecg.modules.iost.basedata.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.beans.BeanUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 入库订单列表
+ * @Author: jeecg-boot
+ * @Date: 2021-06-04
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value = "warehousing对象", description = "移库列表")
+public class HouseWarehousingPage implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private int id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**
+     * 采购顶单号
+     */
+    @Excel(name = "采购顶单号", width = 15)
+    @ApiModelProperty(value = "采购顶单号")
+    private Integer purchaseid;
+    /**
+     * 入库订单编号
+     */
+    @Excel(name = "入库订单编号", width = 15)
+    @ApiModelProperty(value = "入库订单编号")
+    private Integer warehousingId;
+    /**
+     * 移出仓库
+     */
+    @Excel(name = "移出仓库", width = 15)
+    @ApiModelProperty(value = "移出仓库")
+    private String warehouseId;
+    /**
+     * 移出仓位
+     */
+    @Excel(name = "移出仓位", width = 15)
+    @ApiModelProperty(value = "移出仓位")
+    private String positionId;
+    /**
+     * 产品编码
+     */
+    @Excel(name = "产品编码", width = 15)
+    @ApiModelProperty(value = "产品编码")
+    private String productcodeId;
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+    private String productname;
+    /**
+     * 数量
+     */
+    @Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private Integer productnumber;
+    /**
+     * 功效
+     */
+    @Excel(name = "功效", width = 15)
+    @ApiModelProperty(value = "功效")
+    private String productnotes;
+
+    /**
+     * 工号
+     */
+    @Excel(name = "工号", width = 15)
+    @ApiModelProperty(value = "工号")
+    private String workNo;
+    /**
+     * 操作员名称
+     */
+    @Excel(name = "操作员名称", width = 15)
+    @ApiModelProperty(value = "操作员名称")
+    private String realname;
+    /**
+     * 上架时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "上架时间")
+    private Date shelftime;
+
+    /**
+     * 移入仓库
+     */
+    @Excel(name = "移入仓库", width = 15)
+    @ApiModelProperty(value = "移入仓库")
+    private String productmove;
+    /**
+     * 移入仓位
+     */
+    @Excel(name = "移入仓位", width = 15)
+    @ApiModelProperty(value = "移入仓位")
+    private String positionmove;
+
+    /**
+     * 移出数量
+     */
+    @Excel(name = "移出数量", width = 15)
+    @ApiModelProperty(value = "移出数量")
+    private Integer moveNum;
+
+    public HouseWarehousing asHouseWarehousing() {
+
+        return new HouseWarehousing();
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/vo/HouseWarehousingVOs.java

+package org.jeecg.modules.iost.basedata.vo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 入库订单列表
+ * @Author: jeecg-boot
+ * @Date:   2021-06-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("house_warehousing")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="warehousing对象", description="移库视图")
+public class HouseWarehousingVOs {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "")
+    private List<HouseWarehousingPage> data;
+    /**创建人*/
+    @ApiModelProperty(value = "")
+    private Map<String,String> formData;
+
+
+
+}
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/vo/WareHouseInfoPage.java

+package org.jeecg.modules.iost.basedata.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Accessors(chain = true)
+@Data
+@ApiModel(value = "house_warehousing对象", description = "仓库仓位")
+public class WareHouseInfoPage {
+    /**
+     * 仓库名
+     */
+    @ApiModelProperty(value = "仓库名")
+    private String wareHouseName;
+    /**
+     * 仓号
+     */
+    @ApiModelProperty(value = "仓号")
+    private String wareHouseNo;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/vo/WareInfoPage.java

+package org.jeecg.modules.iost.basedata.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Accessors(chain = true)
+@Data
+@ApiModel(value = "产品信息对象", description = "产品信息")
+public class WareInfoPage {
+    /**
+     * 产品名
+     */
+    @ApiModelProperty(value = "产品名")
+    private String wareName;
+    /**
+     * 产品编号
+     */
+    @ApiModelProperty(value = "产品编号")
+    private String[] wareNo;
+
+    /**
+     * 产品功效
+     */
+    @ApiModelProperty(value = "产品功效")
+    private String[] warePurpose;
+
+    /**
+     * 产品数量
+     */
+    @ApiModelProperty(value = "产品数量")
+    private int wareNum;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

 package org.jeecg.modules.system.controller;
 
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,6 +25,7 @@ import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.util.RandImageUtil;
+import org.jeecg.modules.system.vo.HousePDALoginVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -73,19 +73,19 @@ public class LoginController {
 		//update-begin--Author:scott  Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
 
 		//update-begin-author:taoyan date:20190828 for:校验验证码
-        String captcha = sysLoginModel.getCaptcha();
-        if(captcha==null){
-            result.error500("验证码无效");
-            return result;
-        }
-        String lowerCaseCaptcha = captcha.toLowerCase();
-		String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), "utf-8");
-		Object checkCode = redisUtil.get(realKey);
-		//当进入登录页时，有一定几率出现验证码错误 #1714
-		if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
-			result.error500("验证码错误");
-			return result;
-		}
+//        String captcha = sysLoginModel.getCaptcha();
+//		if(captcha==null){
+//			result.error500("验证码无效");
+//			return result;
+//		}
+//		String lowerCaseCaptcha = captcha.toLowerCase();
+//		String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), "utf-8");
+//		Object checkCode = redisUtil.get(realKey);
+//		//当进入登录页时，有一定几率出现验证码错误 #1714
+//		if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+//			result.error500("验证码错误");
+//			return result;
+//		}
 		//update-end-author:taoyan date:20190828 for:校验验证码
 		
 		//1. 校验用户是否有效
@@ -116,7 +116,7 @@ public class LoginController {
         //update-end--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
 		return result;
 	}
-	
+
 	/**
 	 * 退出登录
 	 * @param request
@@ -150,7 +150,9 @@ public class LoginController {
 	    	return Result.error("Token无效!");
 	    }
 	}
-	
+
+
+
 	/**
 	 * 获取访问量
 	 * @return

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/HousePDALoginVO.java

+package org.jeecg.modules.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 登录表单
+ *
+ * @Author scott
+ * @since  2019-01-18
+ */
+@ApiModel(value="PDA登录对象", description="PDA登录对象")
+public class HousePDALoginVO{
+	@ApiModelProperty(value = "账号")
+    private String username;
+	@ApiModelProperty(value = "密码")
+    private String password;
+
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
\ No newline at end of file

jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -131,6 +131,11 @@ spring:
             username: root
             password: root
             driver-class-name: com.mysql.cj.jdbc.Driver
+#            url: jdbc:mysql://wmssystem-mysql:13579/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#            username: root
+#            password: gf^*i6%&9J83&(*kJ653F&L
+#            driver-class-name: com.mysql.cj.jdbc.Driver
+
           # 多数据源配置
             #multi-datasource1:
             #  url: jdbc:mysql://localhost:3306/ceshi2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java

 package org.jeecg;
 
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.security.SecurityTools;
 import org.jeecg.common.util.security.entity.*;
+import org.jeecg.modules.iost.basedata.entity.HouseLocationReady;
 import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
+import org.jeecg.modules.iost.basedata.service.HouseILocationReadyService;
 import org.jeecg.modules.iost.basedata.service.HouseIWarehouseService;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import java.util.List;
+
 public class SecurityToolsTest {
     @Autowired
-    private HouseIWarehouseService warehouseService ;
+    private HouseIWarehouseService warehouseService;
+    @Autowired
+    private HouseILocationReadyService locationReadyService;
+
     @Test
-    public void Test(){
+    public void Test() {
         MyKeyPair mkeyPair = SecurityTools.generateKeyPair();
 
         JSONObject msg = new JSONObject();
@@ -54,15 +63,10 @@ public class SecurityToolsTest {
         //sucess 为验签成功失败标志 true代码验签成功，false代表失败
         System.out.println(new JSONObject(securityResp).toStringPretty());
     }
-    @AutoLog(value = "仓库列表-通过仓位查询")
-    @ApiOperation(value="仓库列表-通过仓位查询", notes="仓库列表-通过仓位查询")
-    @GetMapping(value = "/querypositionid")
+
+
     @Test
     public void querypositionid() {
-        HouseWarehouse houseWarehouse = warehouseService.getBaseMapper().selectById(1);//new QueryWrapper<Warehouse>().like("PositionId","A001"));
-        if(houseWarehouse ==null) {
-            //return Result.error("未找到对应数据");
-        }
-        //return Result.OK(warehouse);
+//
     }
 }