From 78dde4ca603b249abbda0e89103a1176f934256d Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 10 Mar 2023 17:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=20=E5=8F=8Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inv/DeviceReceiveDetailController.java         |  7 +++++++
 .../api/dao/inv/DeviceReceiveOrderDetailDao.java   |  2 ++
 .../inv/FilterDeviceReceiveOrderDetailRequest.java |  2 +-
 .../inv/DeviceReceiveOrderDetailService.java       |  5 +++++
 .../impl/DeviceReceiveOrderDetailServiceImpl.java  | 13 +++++++++++++
 .../mapper/inv/DeviceReceiveOrderDetailDao.xml     | 14 ++++++++++++++
 6 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java
index de22e6a50..54d9799bb 100644
--- a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java
+++ b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java
@@ -121,4 +121,11 @@ public class DeviceReceiveDetailController {
         return ResultVOUtils.page(pageInfo);
     }
 
+    @GetMapping("/device/receive/order/detail/selectByorderIdFk")
+    public BaseResponse selectByorderIdFk(FilterDeviceReceiveOrderDetailRequest  detailRequest) {
+        List<DeviceReceiveOrderDetailResponse> list = detailService.selectByorderIdFk(detailRequest);
+        PageInfo<DeviceReceiveOrderDetailResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
 }
diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java
index 3e3efbb8e..fe4b355d5 100644
--- a/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java
+++ b/src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java
@@ -17,6 +17,8 @@ public interface DeviceReceiveOrderDetailDao extends BaseMapper<DeviceReceiveOrd
      */
     List<DeviceReceiveOrderDetailEntity> selectByOrderId(@Param("orderId") String orderId);
 
+    List<DeviceReceiveOrderDetailResponse> selectByorderIdFk(FilterDeviceReceiveOrderDetailRequest detailRequest);
+
     /**
      * 查询领用记录详情列表
      *
diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java
index b8b8fe880..e60fa8e1e 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java
@@ -43,5 +43,5 @@ public class FilterDeviceReceiveOrderDetailRequest extends ListPageRequest {
      * 状态
      */
     private Integer status;
-
+    
 }
diff --git a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java
index f2b673074..9b0596b6c 100644
--- a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java
+++ b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java
@@ -5,6 +5,7 @@ import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity;
 import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest;
 import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest;
 import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -53,4 +54,8 @@ public interface DeviceReceiveOrderDetailService {
      */
     BaseResponse checkCode(String code);
 
+
+    List<DeviceReceiveOrderDetailResponse> selectByorderIdFk(FilterDeviceReceiveOrderDetailRequest detailRequest);
+
+
 }
diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
index efe56d0dd..9e5db2cf1 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
@@ -237,4 +237,17 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
         }
         return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此条码在库存中不存在，无法领用！");
     }
+
+    @Override
+    public List<DeviceReceiveOrderDetailResponse> selectByorderIdFk(FilterDeviceReceiveOrderDetailRequest detailRequest) {
+        if (null == detailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != detailRequest.getPage() && null != detailRequest.getLimit()) {
+            PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit());
+        }
+        return deviceReceiveOrderDetailDao.filterList(detailRequest);
+    }
+
+
 }
diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml
index 091dd2edc..9ae6c2e69 100644
--- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml
@@ -7,6 +7,20 @@
         where orderIdFk = #{orderId}
     </select>
 
+    <select id="selectByorderIdFk" resultType="com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse">
+        select drod.*, bp.manufactory, bp.ylqxzcrbarmc, bp.zczbhhzbapzbh,bp.cpmctymc,bp.ggxh
+        from device_receive_order_detail drod
+        left join basic_udirel bu on bu.id = drod.relId
+        left join basic_products bp on bp.uuid = bu.uuid
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND drod.orderIdFk = #{orderIdFk}
+            </if>
+        </where>
+
+        order by drod.id
+    </select>
+
     <delete id="deleteByOrderId">
         delete
         from device_receive_order_detail