diff --git a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java index 02bb741..277a9ee 100644 --- a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java +++ b/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 getManualStock(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId) { - // TODO - return materialStockDetailService.getByApplyId(applyId); - + List result = manualStockDetailService.getByApplyId(applyId); + result.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType()))); + return result; } diff --git a/src/main/java/tech/riemann/ims/dto/response/ManualStockDTO.java b/src/main/java/tech/riemann/ims/dto/response/ManualStockDTO.java index ae80ac8..d6b3d33 100644 --- a/src/main/java/tech/riemann/ims/dto/response/ManualStockDTO.java +++ b/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 = "规格" ) diff --git a/src/main/java/tech/riemann/ims/mapper/material/ManualStockDetailMapper.java b/src/main/java/tech/riemann/ims/mapper/material/ManualStockDetailMapper.java index e202237..4973886 100644 --- a/src/main/java/tech/riemann/ims/mapper/material/ManualStockDetailMapper.java +++ b/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 { + List getByApplyId(@Param("applyId") Long applyId); } diff --git a/src/main/java/tech/riemann/ims/mapper/material/MaterialStockDetailMapper.java b/src/main/java/tech/riemann/ims/mapper/material/MaterialStockDetailMapper.java index 45aaffd..4140b36 100644 --- a/src/main/java/tech/riemann/ims/mapper/material/MaterialStockDetailMapper.java +++ b/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 接口 diff --git a/src/main/java/tech/riemann/ims/service/material/IManualStockDetailService.java b/src/main/java/tech/riemann/ims/service/material/IManualStockDetailService.java index d2ce34f..ae65a1b 100644 --- a/src/main/java/tech/riemann/ims/service/material/IManualStockDetailService.java +++ b/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, IdNameEntityService { + List getByApplyId(Long applyId); } diff --git a/src/main/java/tech/riemann/ims/service/material/IMaterialStockDetailService.java b/src/main/java/tech/riemann/ims/service/material/IMaterialStockDetailService.java index 1fb625b..448bd8b 100644 --- a/src/main/java/tech/riemann/ims/service/material/IMaterialStockDetailService.java +++ b/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 java.util.List; +import tech.riemann.ims.entity.material.MaterialStockDetail; /** *

@@ -18,5 +15,4 @@ import java.util.List; */ public interface IMaterialStockDetailService extends IService, IdNameEntityService { - List getByApplyId(Long applyId); } diff --git a/src/main/java/tech/riemann/ims/service/material/impl/ManualStockDetailServiceImpl.java b/src/main/java/tech/riemann/ims/service/material/impl/ManualStockDetailServiceImpl.java index 3fa1025..7ee8dd1 100644 --- a/src/main/java/tech/riemann/ims/service/material/impl/ManualStockDetailServiceImpl.java +++ b/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 getByApplyId(Long applyId) { + return baseMapper.getByApplyId(applyId); + } } diff --git a/src/main/java/tech/riemann/ims/service/material/impl/MaterialStockDetailServiceImpl.java b/src/main/java/tech/riemann/ims/service/material/impl/MaterialStockDetailServiceImpl.java index 0a489b9..4d39a54 100644 --- a/src/main/java/tech/riemann/ims/service/material/impl/MaterialStockDetailServiceImpl.java +++ b/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; /** *

@@ -46,8 +41,4 @@ public class MaterialStockDetailServiceImpl extends ServiceImpl getByApplyId(Long applyId) { - return List.of(); - } } diff --git a/src/main/resources/mapper/ManualStockDetailMapper.xml b/src/main/resources/mapper/ManualStockDetailMapper.xml new file mode 100644 index 0000000..4293d41 --- /dev/null +++ b/src/main/resources/mapper/ManualStockDetailMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file