🆕 查询

人工盘点数据

src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java

@@ -202,9 +202,9 @@ public class ApplyFormController {
     @GetMapping("manual/data/{applyId}")
     @Operation(summary = "获取人工盘点数据")
     public List<ManualStockDTO> getManualStock(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId) {
-        // TODO
+        List<ManualStockDTO> result = manualStockDetailService.getByApplyId(applyId);
-        return materialStockDetailService.getByApplyId(applyId);
+        result.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType())));
-
+        return result;
     }
 
 

src/main/java/tech/riemann/ims/dto/response/ManualStockDTO.java

@@ -32,7 +32,6 @@ public class ManualStockDTO {
     private String typeName;
 
     @Schema(description = "价格")
-   
     private BigDecimal price;
 
     @Schema(description = "规格" )

src/main/java/tech/riemann/ims/mapper/material/ManualStockDetailMapper.java

@@ -1,11 +1,16 @@
 package tech.riemann.ims.mapper.material;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import tech.riemann.ims.dto.response.ManualStockDTO;
 import tech.riemann.ims.entity.material.ManualStockDetail;
 
+import java.util.List;
+
 /**
  * @author mayong
  * @since 2024/11/28 15:38
  */
 public interface ManualStockDetailMapper extends BaseMapper<ManualStockDetail> {
+    List<ManualStockDTO> getByApplyId(@Param("applyId") Long applyId);
 }

src/main/java/tech/riemann/ims/mapper/material/MaterialStockDetailMapper.java

@@ -1,7 +1,7 @@
 package tech.riemann.ims.mapper.material;
 
-import tech.riemann.ims.entity.material.MaterialStockDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import tech.riemann.ims.entity.material.MaterialStockDetail;
 
 /**
  * 物料明细数据表 Mapper 接口

src/main/java/tech/riemann/ims/service/material/IManualStockDetailService.java

@@ -2,12 +2,16 @@ package tech.riemann.ims.service.material;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nutz.spring.boot.service.interfaces.IdNameEntityService;
+import tech.riemann.ims.dto.response.ManualStockDTO;
 import tech.riemann.ims.entity.material.ManualStockDetail;
 
+import java.util.List;
+
 /**
  * @author mayong
  * @since 2024/11/28 15:41
  */
 public interface IManualStockDetailService extends IService<ManualStockDetail>, IdNameEntityService<ManualStockDetail> {
 
+    List<ManualStockDTO> getByApplyId(Long applyId);
 }

src/main/java/tech/riemann/ims/service/material/IMaterialStockDetailService.java

@@ -1,11 +1,8 @@
 package tech.riemann.ims.service.material;
 
-import tech.riemann.ims.dto.response.ManualStockDTO;
-import tech.riemann.ims.entity.material.MaterialStockDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nutz.spring.boot.service.interfaces.IdNameEntityService;
-
+import tech.riemann.ims.entity.material.MaterialStockDetail;
-import java.util.List;
 
 /**
  * <p>
@@ -18,5 +15,4 @@ import java.util.List;
  */
 public interface IMaterialStockDetailService extends IService<MaterialStockDetail>, IdNameEntityService<MaterialStockDetail> {
 
-    List<ManualStockDTO> getByApplyId(Long applyId);
 }

src/main/java/tech/riemann/ims/service/material/impl/ManualStockDetailServiceImpl.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.nutz.dao.Dao;
 import org.springframework.stereotype.Service;
+import tech.riemann.ims.dto.response.ManualStockDTO;
 import tech.riemann.ims.entity.material.ManualStockDetail;
 import tech.riemann.ims.mapper.material.ManualStockDetailMapper;
 import tech.riemann.ims.service.material.IManualStockDetailService;
 
+import java.util.List;
+
 /**
  * @author mayong
  * @since 2024/11/28 15:36
@@ -23,4 +26,8 @@ public class ManualStockDetailServiceImpl extends ServiceImpl<ManualStockDetailM
         return dao;
     }
 
+    @Override
+    public List<ManualStockDTO> getByApplyId(Long applyId) {
+        return baseMapper.getByApplyId(applyId);
+    }
 }

src/main/java/tech/riemann/ims/service/material/impl/MaterialStockDetailServiceImpl.java

@@ -1,17 +1,12 @@
 package tech.riemann.ims.service.material.impl;
 
-import tech.riemann.ims.dto.response.ManualStockDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.nutz.dao.Dao;
+import org.springframework.stereotype.Service;
 import tech.riemann.ims.entity.material.MaterialStockDetail;
 import tech.riemann.ims.mapper.material.MaterialStockDetailMapper;
 import tech.riemann.ims.service.material.IMaterialStockDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import lombok.RequiredArgsConstructor;
-
-import org.nutz.dao.Dao;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
 
 /**
  * <p>
@@ -46,8 +41,4 @@ public class MaterialStockDetailServiceImpl extends ServiceImpl<MaterialStockDet
         return MaterialStockDetail.class;
     }
 
-    @Override
-    public List<ManualStockDTO> getByApplyId(Long applyId) {
-        return List.of();
-    }
 }

src/main/resources/mapper/ManualStockDetailMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="tech.riemann.ims.mapper.material.ManualStockDetailMapper">
+
+    <resultMap id="resultMap" type="tech.riemann.ims.dto.response.ManualStockDTO">
+        <result property="code" column="m_code"/>
+        <result property="name" column="m_name"/>
+        <result property="type" column="m_type"/>
+        <result property="price" column="m_price"/>
+        <result property="spec" column="m_spec"/>
+        <result property="applyId" column="m_apply_id"/>
+        <result property="materialId" column="m_material_id"/>
+        <result property="stock" column="m_stock"/>
+        <result property="manualStock" column="m_manual_stock"/>
+        <result property="msg" column="m_msg"/>
+    </resultMap>
+
+    <select id="getByApplyId" resultMap="resultMap">
+        SELECT
+        ms.m_apply_id,
+        ms.m_material_id,
+        ms.m_manual_stock,
+        ms.m_msg,
+        m.m_spec,
+        m.m_stock,
+        m.m_name,
+        m.m_type,
+        m.m_code,
+        m.m_price
+        FROM
+        t_manual_stock_detail ms
+        left join t_material m on m.id = ms.m_material_id
+        where ms.m_apply_id = #{applyId}
+    </select>
+</mapper>