修改资产管理页面 及bug

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);
+    }
+
 }

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);
+
     /**
      * 查询领用记录详情列表
      *

src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java

@@ -43,5 +43,5 @@ public class FilterDeviceReceiveOrderDetailRequest extends ListPageRequest {
      * 状态
      */
     private Integer status;
-
+    
 }

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);
+
+
 }

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);
+    }
+
+
 }

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