修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/HouseWarehousingLocationController.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 org.jeecg.common.api.vo.Result;
 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.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.iost.basedata.entity.*;
 import org.jeecg.modules.iost.basedata.entity.Vo.HouseSubmitVo;
 import org.jeecg.modules.iost.basedata.service.*;
@@ -13,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +40,29 @@ public class HouseWarehousingLocationController extends JeecgController<HouseWar
     @Autowired
     HouseILocationReadyService houseILocationReadyService;
 
+    /**
+     * 分页列表查询
+     *
+     * @param houseWarehousingLocation
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "入库定位单-分页列表查询")
+    @ApiOperation(value="入库定位单-分页列表查询", notes="入库定位单-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(HouseWarehousingLocation houseWarehousingLocation,
+                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<HouseWarehousingLocation> queryWrapper = QueryGenerator.initQueryWrapper(houseWarehousingLocation, req.getParameterMap());
+        Page<HouseWarehousingLocation> page = new Page<HouseWarehousingLocation>(pageNo, pageSize);
+        IPage<HouseWarehousingLocation> pageList = houseIWarehousingLocationService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
     /*根据仓位查询仓库*/
     @AutoLog(value = "根据仓位查询仓库")
     @ApiOperation(value = "根据仓位查询仓库", notes = "根据仓位查询仓库")

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

@@ -95,15 +95,5 @@ public class HouseWarehousingLocation implements Serializable {
     @ApiModelProperty(value = "状态")
     private String status;
 
-    /**
-     * 待上架产品明细
-     */
-    @ApiModelProperty(value = "待上架产品明细")
-    private List<HouseLocationReady> houseLocationReadyList;
 
-    /**
-     * 已上架产品明细
-     */
-    @ApiModelProperty(value = "已上架产品明细")
-    private List<HouseWarehousing> houseWarehousingList;
 }

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

@@ -56,6 +56,8 @@ public class HouseRelocationServiceImpl extends ServiceImpl<HouseRelocationMappe
     @Transactional
     public Result<?> updateHouseWareHouseByThree(List<HouseMoveWarehouse> houseMoveWarehouses, EmployeeMsgVo employeeMsg) {
         for (HouseMoveWarehouse houseMoveWarehouse : houseMoveWarehouses) {
+            //如果新移入的仓位是自己本身的仓位就不进行下面的操作
+            if(!houseMoveWarehouse.getPositionid().equals(employeeMsg.getNewPositionId())) {
                 HouseWarehouse h = new HouseWarehouse();
                 h.setProductcodeId(houseMoveWarehouse.getProductcodeId());
                 h.setProductname(houseMoveWarehouse.getProductname());
@@ -96,7 +98,7 @@ public class HouseRelocationServiceImpl extends ServiceImpl<HouseRelocationMappe
                         int i1 = houseIWarehouseService.getBaseMapper().updateById(h.setProductnum(String.valueOf(AfterProductnum2)));
                     }
                     //更新移库记录表-记录员工操作
-                UpdateRelocationTable(houseMoveWarehouse,employeeMsg);
+                    UpdateRelocationTable(houseMoveWarehouse, employeeMsg);
                 }
                 //如果新的仓位不存在该产品
                 else {
@@ -120,7 +122,8 @@ public class HouseRelocationServiceImpl extends ServiceImpl<HouseRelocationMappe
                         int i = houseIWarehouseService.getBaseMapper().updateById(h.setProductnum(String.valueOf(AfterProductnum)));
                     }
                     //更新移库记录表-记录员工操作
-                UpdateRelocationTable(houseMoveWarehouse,employeeMsg);
+                    UpdateRelocationTable(houseMoveWarehouse, employeeMsg);
+                }
             }
         }
         return Result.OK("移库成功");