feat: 修复了容器管理增加托盘1个会失败的问题

易文鹏
1 parent 1ca89a52
Showing 2 changed files with 27 additions and 19 deletions
src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
@@ -24,7 +24,7 @@ import java.util.Date;
 import java.util.List;
 @Service
-public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService{
+public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService {
     @Resource
     private ContainerTypeService containerTypeService;
@@ -37,10 +37,9 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
     @Override
     public AjaxResult<List<Container>> insertContainer(String type, Integer quantity) {
-        List<Container>  containerList = new ArrayList<>();
-        List<Container> containers =new ArrayList<>();
+        List<Container> containers = new ArrayList<>();
         Integer number = getNumber(type);
-        for(int i=0; i<quantity; i++) {
+        for (int i = 0; i < quantity; i++) {
             number++;
             Container container = new Container();
             container.setContainerType(type);
@@ -51,10 +50,10 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
             container.setLastUpdated(null);
             container.setLastUpdatedBy(null);
             container.setEnable(true);
-            //container.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
             container.setWarehouseCode(ShiroUtils.getWarehouseCode());
             containers.add(container);
-            if( i>0 && (i%1000==0 || i == quantity-1)){
+
+            if (i % 1000 == 0 || i == quantity - 1) {
                 containerMapper.addList(containers);
                 containers = new ArrayList<>();
             }
@@ -75,16 +74,16 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
         //如果指定类型的最后的code存在，那么 code = 容器类型 + (排序号 + 1)
         if (container != null && container.getCode() != null) {
             Integer number = Integer.valueOf(container.getCode().substring(container.getCode().length() - 5, container.getCode().length()));
-            return  number;
+            return number;
         } else {
-            return  0;
+            return 0;
         }
     }
     @Override
-    public String importContainer(List<Container> containerList, Boolean updateSupport, String operName){
+    public String importContainer(List<Container> containerList, Boolean updateSupport, String operName) {
         if (StringUtils.isNull(containerList) || containerList.size() == 0) {
-            throw new  BusinessException("导入数据不能为空！");
+            throw new BusinessException("导入数据不能为空！");
         }
         int successNum = 0;
         int failureNum = 0;
@@ -127,15 +126,15 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
     /**
      * 已入空容器展示
-     * */
+     */
     @Override
     public List<Location> getEmptyContainerInLocation(String zoneCode, String containerCode, String locationCode, String warehouseCode) {
-        return containerMapper.getEmptyContainerInLocation(zoneCode, containerCode,locationCode,warehouseCode);
+        return containerMapper.getEmptyContainerInLocation(zoneCode, containerCode, locationCode, warehouseCode);
     }
     /**
      * 修改容器库位和状态
-     * */
+     */
     @Override
     public void updateLocationCodeAndStatus(String containerCode, String locationCode, String status) {
         if (StringUtils.isNotEmpty(containerCode) || StringUtils.isNotEmpty(locationCode)) {
@@ -154,15 +153,16 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
     public boolean updateStatus(String containerCode, String status, String warehouseCode) {
         LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
         containerLambdaQueryWrapper.eq(Container::getCode, containerCode)
-                                    .eq(Container::getWarehouseCode, warehouseCode);
+                .eq(Container::getWarehouseCode, warehouseCode);
         Container container = getOne(containerLambdaQueryWrapper);
         container.setStatus(status);
-        boolean result =  update(container, containerLambdaQueryWrapper);
+        boolean result = update(container, containerLambdaQueryWrapper);
         return result;
     }
     /**
      * 如果为临时容器，在取消组盘和出库任务完成时删除容器
+     *
      * @param containerType 容器类型
      * @param containerCode 容器编码
      * @return
@@ -172,8 +172,8 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
     public void removeContainer(String containerType, String containerCode) {
         if ("LS".equals(containerType)) {
             LambdaQueryWrapper<Container> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.eq(Container::getCode,containerCode);
-            if (!this.remove(lambdaQueryWrapper)){
+            lambdaQueryWrapper.eq(Container::getCode, containerCode);
+            if (!this.remove(lambdaQueryWrapper)) {
                 throw new ServiceException("删除临时容器失败");
             }
         }
@@ -112,8 +112,16 @@ public class InventoryHeaderController extends BaseController {
                 .in(InventoryHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
                 .orderByDesc(InventoryHeader::getId);
-        IPage<InventoryHeader> iPage = inventoryHeaderService.page(new Page<>(pageNum, pageSize), lambdaQueryWrapper);
-        return getMpDataTable(inventoryHeaderService.inventoryToDto(iPage.getRecords()), iPage.getTotal());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            //分页查询
+            Page<InventoryHeader> page = new Page<>(pageNum, pageSize);
+            IPage<InventoryHeader> iPage = inventoryHeaderService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(inventoryHeaderService.inventoryToDto(iPage.getRecords()), iPage.getTotal());
+        } else {
+            List<InventoryHeader> list = inventoryHeaderService.list(lambdaQueryWrapper);
+            return getDataTable(inventoryHeaderService.inventoryToDto(list));
+        }
     }