Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EpcListDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EpcListDto implements Serializable {
+
+    private String sizeId;
+    private String sizeName;
+    private String typeId;
+    private String typeName;
+    private String price;
+    private String count;
+}
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ViewCountDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+@Data
+public class ViewCountDto implements Serializable {
+    private String errorEPC;
+    private List<EpcListDto> eqList;
+}

jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java

@@ -3,6 +3,8 @@ package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
+import com.junmp.jyzb.api.bean.dto.EpcListDto;
+import com.junmp.jyzb.api.bean.dto.ViewCountDto;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
 import com.junmp.jyzb.api.bean.req.UpdateDetailReq;
 import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
@@ -12,7 +14,6 @@ import com.junmp.jyzb.service.BussinessInventoryService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -105,4 +106,10 @@ BussinessInventoryController {
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.UseOrFinished(req));
     }
+
+    @PostMapping(path="/GetInfoByEpcs",name="根据EPC列表换取详细信息#logType=30")
+    @ApiOperation("根据EPC列表换取详细信息")
+    public ApiRes<ViewCountDto> GetInfoByEpcs (@RequestBody UploadInventoryReq req){
+        return ApiRes.success(BussinessInventoryService.GetInfoByEpcs(req));
+    }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java

@@ -12,15 +12,12 @@ import com.junmp.jyzb.api.bean.req.InvExpireReq;
 import com.junmp.jyzb.api.bean.vo.InventoryVo;
 import com.junmp.jyzb.entity.Inventory;
 import com.junmp.jyzb.entity.InventorySummary;
-import liquibase.pro.packaged.L;
-import liquibase.pro.packaged.S;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface InventoryMapper extends BaseMapper<Inventory> {
@@ -29,6 +26,7 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
     //根据单警柜统计装备信息
     List<WarehouseInvDto> GetViewWarehouseInv(@Param("warehouseId") Long orgId,@Param("typeIdsList") List<String> typeIdsList,@Param("sizeIds") List<String> sizeIds);
     List<ViewEquipmentDto> GetViewEquipment(@Param("epcList") List<String> epcList);
+    List<EpcListDto> GetViewCountByepcs(@Param("epcList") List<String> epcList);
 
     List<InventoryMapDto> GetViewInventoryMap(@Param("warehouseId") String warehouseId);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/BussinessInventoryService.java

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.dto.BusFormDto;
 import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
+import com.junmp.jyzb.api.bean.dto.EpcListDto;
+import com.junmp.jyzb.api.bean.dto.ViewCountDto;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
-import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
 import com.junmp.jyzb.api.bean.req.*;
-import com.junmp.jyzb.entity.BusForm;
 import com.junmp.jyzb.entity.BussinessInventory;
 import com.junmp.v2.db.api.page.PageResult;
-import com.sun.org.apache.xpath.internal.operations.Bool;
-
-import java.util.List;
 
 
 public interface BussinessInventoryService extends IService<BussinessInventory> {
 
     String AddInvOrder(UpdateInventoryReq req);
-
+    ViewCountDto GetInfoByEpcs(UploadInventoryReq epcs);
     String DeleteOrder(UpdateInventoryReq req);
     BussinessInventoryDto Check(BussinessInventoryReq req);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -21,7 +21,6 @@ import com.junmp.jyzb.cache.MsgRedisCache;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.BussinessInventoryMapper;
 import com.junmp.jyzb.mapper.InventoryMapper;
-import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.RabbitMQSendMsg;
@@ -216,6 +215,31 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
 
     @Transactional(rollbackFor = Exception.class)
+    public ViewCountDto GetInfoByEpcs(UploadInventoryReq req) {
+        List<String> UpdateInventorys;
+
+        if (req.getEpcList()!=null&&req.getEpcList().contains(",")) {
+            UpdateInventorys = Arrays.asList(req.getEpcList().split(","));
+        } else {
+            UpdateInventorys = new ArrayList<>(Collections.singletonList(req.getEpcList()));
+        }
+        ViewCountDto viewEd=new ViewCountDto();
+        viewEd.setEqList(inventoryMapper.GetViewCountByepcs(UpdateInventorys));
+        List<String> existEpc=inventoryMapper.checkEPCList(UpdateInventorys);
+        // 找出在UpdateInventorys中有但existEpc中没有的数据，并进行拼接
+        List<String> notInExistEpc = UpdateInventorys.stream()
+                .filter(epc -> !existEpc.contains(epc))
+                .collect(Collectors.toList());
+        if (notInExistEpc.size()>0)
+        {
+            String result = String.join(", ", notInExistEpc);
+            viewEd.setErrorEPC(result);
+        }
+
+        return viewEd;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
     public String DeleteOrder(UpdateInventoryReq req) {
         if (StringUtils.isNotBlank(req.getId()))
         {

jyzb-biz/src/main/resources/mapper/InventoryMapper.xml

@@ -38,6 +38,24 @@
   </sql>
 
 
+    <select id="GetViewCountByepcs" resultType="com.junmp.jyzb.api.bean.dto.EpcListDto">
+        SELECT
+        typeId, sizeId, price,
+        MAX(typeName) as typeName,
+        MAX(sizeName) as sizeName,
+        COUNT(*) as count
+        FROM
+        view_equipment
+        WHERE
+
+        epc IN
+        <foreach collection="epcList " item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        GROUP BY
+        typeId, sizeId, price;
+    </select>
+
     <select id="GetViewEquipment" resultType="com.junmp.jyzb.api.bean.dto.ViewEquipmentDto">
         SELECT
         *

jyzb-boot/src/main/resources/application.yml

@@ -33,7 +33,7 @@ spring:
       virtual-host: /
   profiles:
     #@spring.active@
-    active: prod
+    active: local
   servlet:
     multipart:
       max-request-size: 500MB