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

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

@@ -137,6 +137,10 @@ public class InventoryDto implements Serializable {
     private int TermState;
 
     private String photo;
+    /**
+     * 使用说明
+     */
+    private String instructions;
 
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/cache/MsgRedisCache.java

@@ -6,6 +6,8 @@ import com.junmp.v2.cache.AbstractRedisCache;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 /**
  * <pre>
  *
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class MsgRedisCache extends AbstractRedisCache<String> {
 
+
     public MsgRedisCache(RedisTemplate<String, String> redisTemplate) {
         super(redisTemplate);
     }

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

@@ -75,4 +75,10 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
                                                @Param("pageSize") Long pageSize);
 
     List<InventorySummary> GetEquipmentSummaryDetail(@Param("req") InventorySumReq req);
+
+    int selectSumByItemsCount(@Param("req") InventoryReq req);
+
+    List<InventoryDto> GetDetailByTerms(@Param("req") InventoryReq req,
+                                        @Param("pageNo") Long pageNo,
+                                        @Param("pageSize") Long pageSize);
 }
\ No newline at end of file

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

@@ -317,6 +317,54 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         return PageResultFactory.createPageResult(page1);
     }
 
+
+    public PageResult<InventoryDto> GetDetailByTerms1(InventoryReq req) {
+//        //根据条件查询仓库下的所有装备
+//        LambdaQueryWrapper<Inventory> eq = new LambdaQueryWrapper<Inventory>()
+//                .eq(Inventory::getOrgId, req.getOrgId())
+//                .eq(ObjectUtil.isNotNull(req.getLocationType()),Inventory::getLocationType, req.getLocationType())
+//                .eq(ObjectUtil.isNotNull(req.getLocationState()) && !req.getLocationState().trim().isEmpty(), Inventory::getLocationState, req.getLocationState())
+//                .eq(ObjectUtil.isNotNull(req.getBussinessState()) && !req.getBussinessState().trim().isEmpty(), Inventory::getBussinessState, req.getBussinessState())
+//                .eq(ObjectUtil.isNotNull(req.getTermState()), Inventory::getTermState, req.getTermState())
+//                .eq(ObjectUtil.isNotNull(req.getSizeId()) && !req.getSizeId().trim().isEmpty(),Inventory::getSizeId,req.getSizeId())
+//                .eq(ObjectUtil.isNotNull(req.getTypeId()) && !req.getTypeId().trim().isEmpty(),Inventory::getTypeId,req.getTypeId())
+//                .eq(ObjectUtil.isNotNull(req.getPrice()),Inventory::getPrice,req.getPrice());
+//        if (req.getLocationType().equals("0")){
+//            eq.eq(ObjectUtil.isNotNull(req.getLocationId()) && !req.getLocationId().trim().isEmpty(), Inventory::getLocationId, req.getLocationId());
+//        }else {
+//            List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>().eq(CabinetBox::getCabinetId, req.getLocationId()));
+//            Set<String> cabinetList=list.stream().map(CabinetBox::getId).collect(Collectors.toSet());
+//            eq.in(Inventory::getLocationId,cabinetList);
+//        }
+//        long size = list(eq).size();
+//        Page<Inventory> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
+//        List<Inventory> records = page.getRecords();
+//        List<InventoryDto> collect = records.parallelStream()
+//                .map(inventory -> {
+//                    InventoryDto inventoryDto = new InventoryDto();
+//                    BeanPlusUtil.copyProperties(inventory, inventoryDto);
+//                    Map<String, String> map = setNames(inventory.getTypeId(), inventory.getSizeId(), inventory.getSupplierId());
+//                    //设置typeName
+//                    inventoryDto.setTypeName(map.get("typeName"));
+//                    //设置sizeName
+//                    inventoryDto.setSizeName(map.get("sizeName"));
+//                    //查询图片并返回
+//                    inventoryDto.setPhoto(map.get("photo"));
+//                    //如果有供应商id的前提下，设置supplierName
+//                    if (ObjectUtil.isNotNull(inventory.getSupplierId())) {
+//                        inventoryDto.setSupplierName(map.get("supplierName"));
+//                    }
+//
+//
+//                    return inventoryDto;
+//                }).collect(Collectors.toList());
+        int size=inventorySummaryMapper.selectSumByItemsCount(req);
+        List<InventoryDto> returnList=inventorySummaryMapper.GetDetailByTerms(req,(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
+        Page<InventoryDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        page1.setRecords(returnList);
+        page1.setTotal(size);
+        return PageResultFactory.createPageResult(page1);
+    }
     //批量进行调整
     @Override
     @Transactional(rollbackFor = Exception.class)

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

@@ -605,6 +605,7 @@
         is.type_name,
         is.size_id,
         is.size_name,
+        is.unit_price,
         sum( is.number ) AS number,
         sum( is.number * is.unit_price ) AS price,
         sum( is.stock_number ) AS stock_number,
@@ -636,10 +637,32 @@
         is.type_id,
         is.type_name,
         is.size_id,
-        is.size_name
+        is.size_name,
+        is.unit_price
         <if test="req.column != null and req.column != '' and req.order != null and req.order != '' ">
             order by ${req.column} ${req.order}
         </if>
     </select>
+    <select id="selectSumByItemsCount" resultType="java.lang.Integer"
+            parameterType="com.junmp.jyzb.api.bean.query.InventoryReq">
+        select count(*) from (
+
+                             ) as a
+    </select>
+    <select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
+        select i.*,et.name as type_name,es.name as size_name,po.org_name as org_name,
+               bs.name as supplier_name,COALESCE(bc.name, bw.name) as location_name,
+               es.photo as photo,es.instructions as instructions
+        FROM base_inventory i
+                 JOIN base_equipment_type et on et.id=i.type_id
+                 join base_equipment_size es on es.id=i.size_id
+                 join pub_org po on i.org_id_int=po.org_id
+                 left join base_supplier bs on bs.id=i.supplier_id
+                 LEFT JOIN base_cabinet_box bcb ON i.location_id = bcb.id and i.location_type=1
+                 LEFT JOIN base_cabinet bc ON bcb.cabinet_id = bc.id
+                 LEFT JOIN base_warehouse bw ON i.location_id = bw.id AND i.location_type = 0
+        WHERE i.org_id_int=#{req.orgId} and i.type_id=#{req.typeId} and i.size_id=#{req.sizeId} and i.price=#{req.price}
+
+    </select>
 
 </mapper>
\ No newline at end of file