|
|
@@ -319,7 +319,7 @@ public class Inc10100Controller extends BaseController {
|
|
|
BizTechnologicalProcess newTech = new BizTechnologicalProcess();
|
|
|
newTech.setProductCode(sfc10400.getCpart().trim());
|
|
|
newTech.setTechnologyVersion(l.getPrver());
|
|
|
- newTech.setTenantId(1L);
|
|
|
+ newTech.setTenantId(Long.parseLong(l.getFacno()));
|
|
|
BizTechnologicalProcessDetail newProcess = new BizTechnologicalProcessDetail();
|
|
|
|
|
|
newProcess.setTechnologyVersion(l.getPrver().trim());
|
|
|
@@ -361,7 +361,9 @@ public class Inc10100Controller extends BaseController {
|
|
|
}
|
|
|
} else {
|
|
|
BizTechnologicalProcessDetail old = processDetails.stream().filter(v -> v.getTechnologyVersion().equals(l.getPrver().trim()) && v.getProductCode().equals(l.getCpart().trim()) && v.getProcessCode().equals(l.getPrcode().trim()) && v.getTechnologicalProcessId().equals(oldTech.getId())).findFirst().orElse(null);
|
|
|
- if (old == null || !old.getProcessStepNumber().trim().equals(l.getPrseq().trim())) {
|
|
|
+ Long count = processDetails.stream().filter(v -> v.getTechnologyVersion().equals(l.getPrver().trim()) && v.getProductCode().equals(l.getCpart().trim())).count();
|
|
|
+ Long newCount = all10401List.stream().filter(v -> v.getCpart().trim().equals(l.getCpart().trim()) && v.getPrver().trim().equals(l.getPrver().trim())).count();
|
|
|
+ if (old == null || !old.getProcessStepNumber().trim().equals(l.getPrseq().trim()) || !newCount.equals(count)) {
|
|
|
// 假设旧工艺不存在，或新的工艺序号和旧的不同则将旧工艺版本isHistory置为1
|
|
|
oldTech.setIsHistory(1);
|
|
|
updateProcess.add(oldTech);
|
|
|
@@ -758,7 +760,7 @@ public class Inc10100Controller extends BaseController {
|
|
|
newProcess.setProductShaftCategory(l.getZtype());
|
|
|
newProcess.setProductShaftCategoryName(l.getZtydm());
|
|
|
newProcess.setProductDescription(l.getDescr());
|
|
|
- newProcess.setTenantId(1L);
|
|
|
+ newProcess.setTenantId(Long.parseLong(l.getFacno()));
|
|
|
if (newProcess.getProductCode() != null && !newProcess.getProductCode().isEmpty()) {
|
|
|
BizProduct bizProduct = products.stream().filter(v -> v.getProductCode().trim().equals(l.getCpart().trim())).findFirst().orElse(null);
|
|
|
if (bizProduct != null) {
|
|
|
@@ -792,7 +794,7 @@ public class Inc10100Controller extends BaseController {
|
|
|
BizTechnologicalProcess newTech = new BizTechnologicalProcess();
|
|
|
newTech.setProductCode(sfc10400.getCpart());
|
|
|
newTech.setTechnologyVersion(l.getPrver());
|
|
|
- newTech.setTenantId(1L);
|
|
|
+ newTech.setTenantId(Long.parseLong(l.getFacno()));
|
|
|
if (newTech.getProductCode() != null && !newTech.getProductCode().isEmpty()) {
|
|
|
BizProduct bizProduct = products.stream().filter(v -> v.getProductCode().equals(sfc10400.getCpart())).findFirst().orElse(null);
|
|
|
if (bizProduct != null) {
|
