From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/ext/impl/MaterialDistributeExtServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/MaterialDistributeExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/MaterialDistributeExtServiceImpl.java
index 2c9fc47..3c2fa44 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/MaterialDistributeExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/MaterialDistributeExtServiceImpl.java
@@ -10,6 +10,7 @@
import doumeemes.dao.ext.MaterialDistributeExtMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import doumeemes.service.ext.ProceduresExtService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,9 @@
@Service
public class MaterialDistributeExtServiceImpl implements MaterialDistributeExtService {
+
+ @Autowired
+ private ProceduresExtService proceduresExtService;
@Autowired
private MaterialDistributeExtMapper materialDistributeExtMapper;
@@ -50,6 +54,10 @@
mev.setUnionCategoryName(mev.getCmodelName());
}
}
+ if(mev.getHasBom() >0 && Constants.equalsInteger(pageWrap.getModel().getQueryType(),Constants.ONE)){
+ //濡傛灉闇�瑕佹煡璇㈠伐鑹鸿矾绾垮伐搴�,鏌ヨbom鍏宠仈宸ヨ壓璺嚎鐨勬墍鏈夊伐搴�
+ mev.setProcedureList(proceduresExtService.getListByMaterialId(mev.getId()));
+ }
}
}
return PageData.from(new PageInfo<>(result));
--
Gitblit v1.9.3