Merge remote-tracking branch 'origin/jnmc-jinco-featurt-lw' into jnmc-jinco

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/InvLotLocIdController.java

@@ -50,8 +50,8 @@ public class InvLotLocIdController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('ams:invLotLocId:list')")
     @GetMapping("/largeScreenList")
-    public TableDataInfo largeScreen(InvLocIdSearchFrom invLocIdSearchFrom) {
-        List<InvLotLocIdLotattLargeScreenVO> invLocIdLotattList = invLotLocIdService.selectInvLocIdLotattLargeScreenList(invLocIdSearchFrom);
+    public TableDataInfo largeScreen(@RequestParam String size) {
+        List<InvLotLocIdLotattLargeScreenVO> invLocIdLotattList = invLotLocIdService.selectInvLocIdLotattLargeScreenList(size);
         return getDataTable(invLocIdLotattList);
     }
 

ruoyi-admin/src/main/resources/application-dev.yml

@@ -57,7 +57,7 @@ spring:
                         multi-statement-allow: true
     redis:
         # 地址
-        host: 154.12.20.200
+        host: 192.168.157.130
         # 端口，默认为6379
         port: 6379
         # 数据库索引

ruoyi-admin/src/test/java/com/ruoyi/admin/test/base/TestDay.java

@@ -0,0 +1,47 @@
+package com.ruoyi.admin.test.base;
+
+import com.ruoyi.RuoYiApplication;
+import com.ruoyi.ams.inv.domain.form.InvLocIdSearchFrom;
+import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattLargeScreenVO;
+import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
+import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+import com.ruoyi.common.core.controller.BaseController;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Slf4j
+public class TestDay extends BaseController {
+
+    @Autowired
+    private IInvLotLocIdService invLotLocIdService;
+
+    @Test
+    public void invLocIdSearchFrom(){
+        InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
+        List<InvLotLocIdLotattVO> list = invLotLocIdService.selectInvLocIdLotattList(invLocIdSearchFrom);
+        list.forEach(item -> System.out.println(item));
+    }
+
+    @Test
+    public void a(){
+        List<InvLotLocIdLotattLargeScreenVO> list = invLotLocIdService.selectInvLocIdLotattLargeScreenList();
+        list.forEach(item -> {
+            System.out.println(item.toString());
+        });
+    }
+
+
+
+
+
+
+}

ruoyi-ui/package.json

@@ -66,6 +66,7 @@
     "@vue/cli-service": "4.4.6",
     "babel-eslint": "10.1.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
+    "babel-plugin-import": "^1.13.8",
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",

warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/vo/InvLotLocIdLotattLargeScreenVO.java

@@ -3,6 +3,7 @@ package com.ruoyi.ams.inv.domain.vo;
 import lombok.Data;
 
 
+
 @Data
 public class InvLotLocIdLotattLargeScreenVO {
     /**
@@ -20,5 +21,9 @@ public class InvLotLocIdLotattLargeScreenVO {
      */
     private Integer palletNum;
 
+    /**
+     * 批次创建时间
+     */
+    private String createTime;
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/vo/InvLotLocIdLotattVO.java

@@ -21,6 +21,7 @@ public class InvLotLocIdLotattVO {
     private Double weight;
     private String palletNo;
     private String isFull;
+    private String createTime;
     private String lotatt01;
     private String lotatt02;
     private String lotatt03;
@@ -40,6 +41,14 @@ public class InvLotLocIdLotattVO {
     private String lotatt17;
     private String lotatt18;
 
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
     public String getLotatt01() {
         return lotatt01;
     }

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/IInvLotLocIdService.java

@@ -72,10 +72,10 @@ public interface IInvLotLocIdService {
     /**
      * 查询物料批次信息大屏列表
      *
-     * @param invLocIdSearchFrom
+     * @param
      * @return
      */
-    List<InvLotLocIdLotattLargeScreenVO> selectInvLocIdLotattLargeScreenList(InvLocIdSearchFrom invLocIdSearchFrom);
+    List<InvLotLocIdLotattLargeScreenVO> selectInvLocIdLotattLargeScreenList(String size);
 
     /**
      * 查询库位库存信息

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.ams.inv.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.service.IWmsBoxInfoService;
 import com.ruoyi.ams.business.IBusinessService;
@@ -36,12 +35,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -129,15 +124,14 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
     }
 
     @Override
-    public List<InvLotLocIdLotattLargeScreenVO> selectInvLocIdLotattLargeScreenList(InvLocIdSearchFrom invLocIdSearchFrom) {
-
-        List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdMapper.selectInvLocIdLotattList(invLocIdSearchFrom);
+    public List<InvLotLocIdLotattLargeScreenVO> selectInvLocIdLotattLargeScreenList(String size) {
+        List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdMapper.selectInvLocIdLotattList(new InvLocIdSearchFrom());
         if(CollectionUtil.isEmpty(invLotLocIdLotattVOS)){
             return new ArrayList<>();
         }
         List<InvLotLocIdLotattLargeScreenVO> invLotLocIdLotattLargeScreenVOS = invLotLocIdLotattVOS
                 .stream()
-                .filter(item -> StringUtils.isNotBlank(item.getZoneName()) && ObjectUtil.isNotNull(item.getQty()))
+                .filter(item -> StringUtils.isNotBlank(item.getZoneName()) && ObjectUtil.isNotNull(item.getQty()) && StringUtils.isNotBlank(item.getCreateTime()))
                 .collect(Collectors.groupingBy(InvLotLocIdLotattVO::getZoneName))
                 .entrySet()
                 .stream()
@@ -146,12 +140,13 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
                     largeScreenVO.setZoneName(entry.getKey());
                     largeScreenVO.setWeight(entry.getValue().stream().mapToDouble(InvLotLocIdLotattVO::getQty).sum());
                     largeScreenVO.setPalletNum(entry.getValue().size());
+                    largeScreenVO.setCreateTime(entry.getValue().stream().map(InvLotLocIdLotattVO::getCreateTime).max(String::compareTo).toString());
                     return largeScreenVO;
                 })
+                .sorted(Comparator.comparing(InvLotLocIdLotattLargeScreenVO::getCreateTime).reversed())
+                .skip(0L).limit(Long.parseLong(size))
                 .collect(Collectors.toList());
         return invLotLocIdLotattLargeScreenVOS;
-
-
     }