violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:PLM为匹配到BOM问题

Browse Source
This commit is contained in:
zzs 2024-12-23 14:08:50 +08:00
parent 36f4cdc1a1
commit 97d5bb8db6
1 changed files with 10 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java
View File

@ -15,7 +15,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
@ -56,26 +58,20 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm);
exestate = "30".equals(exestate) ? "B" : "A";
if (plmMatchBom != null && !plmMatchBom) {
// Date stoptime = plm.getDate("yem_stoptime");
Date downdate = bom.getDate("yem_downdate");
if (YEM.isNotEmpty(downdate)) {
plm.set("yem_enablestatus_before", bom_enablesta);
plm.set("yem_stoptime", downdate);
// plm.set("yem_invoktime", bom_completetime);
// plm.set("yem_invokstatus", exestate);
} else {
logger.info("停用_无时间，不更新，{}，{}", plm_billno, plm_parent);
}
}
if (plmMatchBom != null && plmMatchBom) {
// Date starttime = plm.getDate("yem_starttime");
Date enableddate = bom.getDate("yem_enableddate");
if (YEM.isNotEmpty(enableddate)) {
plm.set("yem_enablesta", bom_enablesta);
plm.set("yem_starttime", enableddate);
// plm.set("yem_invoktime", bom_completetime);
// plm.set("yem_invokstatus", exestate);
if (YEM.isNotEmpty(bom_completetime)) {
plm.set("yem_invoktime", bom_completetime);
@ -89,51 +85,12 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
}
}
}
//
// for (DynamicObject plmObj : plms) {
// DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail");
// String plm_billno = plmObj.getString("yem_gybg_no");//PLM工艺变更单号
// for (DynamicObject plm : plm_entry) {
// String plm_parent = plm.getString("yem_textfield");//总成编码
// for (DynamicObject bomObj : boms) {
// DynamicObjectCollection bom_entry = bomObj.getDynamicObjectCollection("yem_entryentity");
// for (DynamicObject bom : bom_entry) {
// String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
// Date bom_completetime = bom.getDate("yem_completetime");
// Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm);
// if (plmMatchBom != null && !plmMatchBom) {
// Date stoptime = plm.getDate("yem_stoptime");
// if (YEM.isEmpty(stoptime)) {
// plm.set("yem_enablestatus_before", bom_enablesta);
// Date downdate = bom.getDate("yem_downdate");
// plm.set("yem_stoptime", downdate);
// plm.set("yem_completetime", bom_completetime);
// } else {
// logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
// }
// }
//
// if (plmMatchBom != null && plmMatchBom) {
// Date starttime = plm.getDate("yem_starttime");
// if (YEM.isEmpty(starttime)) {
// Date enableddate = bom.getDate("yem_enableddate");
// plm.set("yem_enablesta", bom_enablesta);
// plm.set("yem_starttime", enableddate);
// plm.set("yem_completetime", bom_completetime);
// } else {
// logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
// }
// }
// }
// }
// }
// }
SaveServiceHelper.save(plms);
}
/**
* PLM匹配BOM，
*
* @param plmObj
* @param bom
* @param plm
@ -151,20 +108,20 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
// BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量
String plm_after_parent_now = plm.getString("yem_parent_now");//父项编码
String plm_after_child_now = plm.getString("yem_child_now");//子项编码
BigDecimal plm_after_qty = plm.getBigDecimal("yem_qty_new");
// BigDecimal plm_after_qty = plm.getBigDecimal("yem_qty_new");
String bom_before_parent_no = bom.getString("yem_parentno");//总成编码
String bom_before_child_no = bom.getString("yem_subno");//数量
BigDecimal bom_before_qty = bom.getBigDecimal("yem_qty");
logger.info("停用_compare: {} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, bom_child, bom_enablesta);
String bom_before_child_no = bom.getString("yem_subno");//子件编码
// BigDecimal bom_before_qty = bom.getBigDecimal("yem_qty");
// logger.info("停用_compare: {} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, bom_child, bom_enablesta);
if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && "B".equals(bom_enablesta)) {
logger.info("停用_PLM匹配到BOM，{} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child);
return false;
}
logger.info("启用_compare：{} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty, bom_enablesta);
if (eq(plm_billno, bom_billno) && eq(plm_after_parent_now, bom_before_parent_no) && eq(plm_after_child_now, bom_before_child_no) && eq(plm_after_qty, bom_before_qty) && "A".equals(bom_enablesta)) {
logger.info("启用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty);
// logger.info("启用_compare：{} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty, bom_enablesta);
if (eq(plm_billno, bom_billno) && eq(plm_after_parent_now, bom_before_parent_no) && eq(plm_after_child_now, bom_before_child_no) && "A".equals(bom_enablesta)) {
logger.info("启用_PLM匹配到BOM，{} {}, {} {}, {} {}", plm_billno, bom_billno, plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no);
return true;
}