diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index 1cfe994e..ca5e0578 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -144,11 +144,11 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { String bom_billno = bom.getString("yem_changeno");//更改单号 String bom_parent = bom.getString("yem_parentno");//父件编码 String bom_child = bom.getString("yem_subno");//子项零件编码 - BigDecimal bom_qty = bom.getBigDecimal("yem_qty");//数量 +// BigDecimal bom_qty = bom.getBigDecimal("yem_qty");//数量 String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态 String plm_parent = plm.getString("yem_textfield");//总成编码 String plm_child = plm.getString("yem_child_before");//子项零件编码 - BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量 +// 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"); @@ -156,9 +156,9 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { 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, plm_qty, bom_child, bom_enablesta); - if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty) && "B".equals(bom_enablesta)) { - logger.info("停用_PLM匹配到BOM,{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_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; }