diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java index 6f24c90..f6e4a36 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java @@ -14,6 +14,7 @@ public interface LdConsumerFormMapper extends BaseMapper { LdConsumerForm selectByMaterialId(@Param("materialId") Long materialId, @Param("demandDepartment") String demandDepartment); + LdConsumerForm selectByMaterialCode(@Param("materialCode") String materialCode); List selectByDepartmentId(@Param("departmentId") String departmentId); diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java index fd6f917..236553e 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java @@ -1,5 +1,6 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; import com.nov.KgLowDurable.pojo.vo.LdTwoInventoryVO; import org.apache.ibatis.annotations.Param; @@ -16,6 +17,6 @@ public interface LdDurableFormMapper extends BaseMapper { List selectDurableFormList(@Param("departmentId") String departmentId, @Param("materialName") String materialName, @Param("num") Integer num); List selectByMaterialId(@Param("materialId") Long materialId, @Param("departmentId") String departmentId); - + LdDurableForm selectByMaterialCode(@Param("materialCode") String materialCode); List selectByIds(@Param("durableIds") List durableIds); } diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java index 4d56998..cecbee4 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java @@ -21,6 +21,7 @@ public interface ILdConsumerFormService extends IService { * @return */ LdConsumerForm getByMaterialId(Long materialId, String demandDepartment); + LdConsumerForm getByMaterialCode(String materialCode); /** * 获取二级出库物资列表 diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java index 158eae2..33ee216 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.dto.LdDurableFormDto; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; +import com.nov.KgLowDurable.pojo.entity.LdTwoInventoryRecord; import com.nov.KgLowDurable.pojo.vo.LdTwoInventoryVO; import java.util.List; @@ -41,6 +42,8 @@ public interface ILdDurableFormService extends IService { */ List getByMaterialId(Long materialId, String departmentId); + LdDurableForm getByMaterialCode(String materialCode); + /** * 根据IDS 擦汗讯 * @param durableIds diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java index 9038766..f911586 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java @@ -42,6 +42,11 @@ public class LdConsumerFormServiceImpl extends ServiceImpl getConsumerFormByDeptId(String departmentId) { return consumerFormMapper.selectByDepartmentId(departmentId); diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java index af38b0f..7795e67 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdDurableFormServiceImpl.java @@ -7,6 +7,7 @@ import com.nov.KgLowDurable.exception.CustomerException; import com.nov.KgLowDurable.mapper.LdDurableFormMapper; import com.nov.KgLowDurable.pojo.dto.LdDurableFormDto; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; +import com.nov.KgLowDurable.pojo.entity.LdTwoInventoryRecord; import com.nov.KgLowDurable.pojo.vo.LdTwoInventoryVO; import com.nov.KgLowDurable.service.ILdDurableFormService; import lombok.AllArgsConstructor; @@ -63,6 +64,11 @@ public class LdDurableFormServiceImpl extends ServiceImpl getByIds(List durableIds) { return durableFormMapper.selectByIds(durableIds); diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoInventoryRecordServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoInventoryRecordServiceImpl.java index 09fa90b..7915701 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoInventoryRecordServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoInventoryRecordServiceImpl.java @@ -1,27 +1,20 @@ package com.nov.KgLowDurable.service.Impl; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.constant.BatchConstant; import com.nov.KgLowDurable.exception.CustomerException; -import com.nov.KgLowDurable.mapper.LdInventoryRecordMapper; import com.nov.KgLowDurable.mapper.LdTwoInventoryRecordMapper; import com.nov.KgLowDurable.pojo.dto.ApproveDto; import com.nov.KgLowDurable.pojo.entity.*; import com.nov.KgLowDurable.service.*; import com.nov.KgLowDurable.util.Func; -import com.nov.KgLowDurable.util.StringUtils; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.math.RoundingMode; -import java.sql.Wrapper; -import java.time.LocalDateTime; import java.util.List; /** @@ -137,7 +130,7 @@ public class LdTwoInventoryRecordServiceImpl extends ServiceImpl outFormList = ldErstockOutFromService.listByOutId(approveDto.getTwoOutStorageId()); + List outFormList = ldErstockOutFromService.listByOutId(ldErstockOut.getId()); for (LdErstockOutForm ldErstockOutForm : outFormList) { // 物资编码 String code = ""; @@ -148,7 +141,7 @@ public class LdTwoInventoryRecordServiceImpl extends ServiceImpl select * from ld_consumer_form where material_id = #{materialId} and department_id = #{demandDepartment} + diff --git a/src/main/resources/mapper/LdDurableFormMapper.xml b/src/main/resources/mapper/LdDurableFormMapper.xml index f657b92..277e1dc 100644 --- a/src/main/resources/mapper/LdDurableFormMapper.xml +++ b/src/main/resources/mapper/LdDurableFormMapper.xml @@ -37,6 +37,9 @@ +