报表在库上架数、在库总数

blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java

@@ -3,6 +3,8 @@ package com.logpm.report.controller;
 
 import com.logpm.report.service.InLibraryDeliverService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -10,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
+
 
 @AllArgsConstructor
 @RestController
@@ -19,8 +23,27 @@ public class IndexCountController {
 	private InLibraryDeliverService inLibraryDeliverService;
 
 	@GetMapping("/index_count")
+	@ApiOperation(value = "定制品在库订单总量",tags = "定制品在库订单总量")
 	public R<Integer> indexCount(@RequestParam("id") Long id) {
 		Integer indexCount = inLibraryDeliverService.indexCount(id);
 		return R.data(indexCount);
 	}
+
+	@GetMapping("/index_number_in_the_library")
+	@ApiOperation(value = "定制品在库订单上架总数",tags = "定制品在库订单上架总数")
+	public R<Integer> getTheNumberOfShelvesInTheLibrary(@RequestParam("id") Long id){
+		Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,2);
+		return  R.data(theNumberOfShelvesInTheLibrary);
+	}
+
+	@GetMapping("/index_number_No_the_library")
+	@ApiOperation(value = "定制品在库订单未上架总数",tags = "定制品在库订单未上架总数")
+	public R<Integer> getTheNumberOfShelvesNoTheLibrary(@RequestParam("id") Long id){
+		Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,1);
+		return  R.data(theNumberOfShelvesInTheLibrary);
+	}
+
+
+
+
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java

@@ -1,6 +1,7 @@
 package com.logpm.report.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,4 +12,9 @@ public interface  InLibraryDeliverMapper  extends BaseMapper {
 
 	Integer obtainTheNumberOfInventoryListings (@Param("id") Long id);
 
+	Integer theNumberOfShelvesInTheLibrary(@Param("id") Long id , Integer order_package_grounding_status);
+
+//	Integer quantityInTransit(@Param("id") Long id,)
 }
+
+

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml

@@ -2,11 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.logpm.report.mapper.InLibraryDeliverMapper">
     <select id="obtainTheNumberOfInventoryListings" resultType="java.lang.Integer">
-    select SUM(
-               quantity
+    select count (
+               *
            ) as con
     from logpm_distribution_parcel_list
-    where warehouse_id = #{id}
-
+    where warehouse_id = #{id} and
+        order_package_status = 20
+        and
+        conditions = 1
+    </select>
+    <select id="theNumberOfShelvesInTheLibrary" resultType="java.lang.Integer">
+        select count (
+                   *
+               ) as con
+        from logpm_distribution_parcel_list
+        where warehouse_id = #{id} and
+            order_package_status = 20
+          and
+            conditions = 1
+          and
+            order_package_grounding_status= #{order_package_grounding_status}
     </select>
 </mapper>

blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java

@@ -2,6 +2,7 @@ package com.logpm.report.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.models.auth.In;
 
 /**
  * @author wzy
@@ -13,6 +14,8 @@ public interface InLibraryDeliverService {
 
 	 Integer indexCount(Long id);
 
+	 Integer theNumberOfShelvesInTheLibrary(Long id,Integer order_package_grounding_statu);
+
 
 
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java

@@ -3,6 +3,7 @@ package com.logpm.report.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.report.mapper.InLibraryDeliverMapper;
 import com.logpm.report.service.InLibraryDeliverService;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -21,4 +22,8 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService {
 	public Integer indexCount(Long id) {
 	return 	 inLibraryDeliverMapper.obtainTheNumberOfInventoryListings(id);
 	}
+
+	public Integer theNumberOfShelvesInTheLibrary(Long id,Integer order_package_grounding_status){
+		return  inLibraryDeliverMapper.theNumberOfShelvesInTheLibrary(id,order_package_grounding_status);
+	}
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java

@@ -97,15 +97,15 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
 					userIds.add(detailsVO.getExamineUser());
 				}
 			}
-			R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ","));
-			if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
-				List<User> data = listR.getData();
-				Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
-				for (BillLoadingDetailsVO detailsVO : detailsPage) {
-					detailsVO.setScanUser(collect.get(detailsVO.getScanUser()));
-					detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser()));
-				}
-			}
+//			R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ","));
+//			if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
+//				List<User> data = listR.getData();
+//				Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
+//				for (BillLoadingDetailsVO detailsVO : detailsPage) {
+//					detailsVO.setScanUser(collect.get(detailsVO.getScanUser()));
+//					detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser()));
+//				}
+//			}
 
 		}
 		return page.setRecords(detailsPage);