bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领料出库流程调试

This commit is contained in:
mashuai 2025-03-06 15:23:58 +08:00
parent 0d53867d46
commit 4295427b2e
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
View File

@ -136,9 +136,10 @@ public interface LeaseApplyDetailsMapper {
/** /**
* 根据领料任务id查询领料任务详细 * 根据领料任务id查询领料任务详细
* @param keyWord
* @param publishTask * @param publishTask
* @return * @return
*/ */
List<LeaseApplyDetails> getDetailsPublish(String publishTask); List<LeaseApplyDetails> getDetailsPublish(@Param("keyWord") String keyWord, @Param("publishTask") String publishTask);
} }

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -129,7 +129,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (StringUtils.isNotBlank(publishTask)) { if (StringUtils.isNotBlank(publishTask)) {
LeaseApplyRequestVo info = new LeaseApplyRequestVo(); LeaseApplyRequestVo info = new LeaseApplyRequestVo();
// 根据领用批次查询领用详情 // 根据领用批次查询领用详情
List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(publishTask); List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(keyword,publishTask);
if (!CollectionUtils.isEmpty(details)) { if (!CollectionUtils.isEmpty(details)) {
for (LeaseApplyDetails detail : details) { for (LeaseApplyDetails detail : details) {
if (detail.getOutNum().compareTo(detail.getAlNum()) == 0) { if (detail.getOutNum().compareTo(detail.getAlNum()) == 0) {

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -351,7 +351,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
if (StringUtils.isNotBlank(record.getPublishTask())) { if (StringUtils.isNotBlank(record.getPublishTask())) {
// 根据领用批次查询领用详情 // 根据领用批次查询领用详情
boolean isFinished = true; boolean isFinished = true;
List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(record.getPublishTask()); List<LeaseApplyDetails> details = leaseApplyDetailsMapper.getDetailsPublish(null, record.getPublishTask());
if (!CollectionUtils.isEmpty(details)) { if (!CollectionUtils.isEmpty(details)) {
for (LeaseApplyDetails bean : details) { for (LeaseApplyDetails bean : details) {
if (bean.getAlNum().compareTo(bean.getPreNum()) != 0) { if (bean.getAlNum().compareTo(bean.getPreNum()) != 0) {

4
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
View File

@ -436,6 +436,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND lpd.publish_task = lod.publish_task AND lpd.publish_task = lod.publish_task
WHERE WHERE
lpd.publish_task = #{publishTask} lpd.publish_task = #{publishTask}
<if test="keyWord != null and keyWord != ''">
AND (mt1.type_name LIKE CONCAT(CONCAT('%', #{keyWord}), '%')
OR mt.type_name LIKE CONCAT(CONCAT('%', #{keyWord}), '%'))
</if>
GROUP BY GROUP BY
lpd.new_type lpd.new_type
</select> </select>