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

Merge branch 'refs/heads/dev-plm' into test

Browse Source
This commit is contained in:
violet 2024-09-11 22:10:38 +08:00
commit b8cd25b566
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
View File

@ -196,14 +196,14 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
addNew.set("yem_parentname", entry.getString("yem_name_newparent"));//替换后-父项名称 addNew.set("yem_parentname", entry.getString("yem_name_newparent"));//替换后-父项名称
addNew.set("yem_subno", entry.getString("yem_child_now"));//替换后-子件编码 addNew.set("yem_subno", entry.getString("yem_child_now"));//替换后-子件编码
addNew.set("yem_subname", entry.getString("yem_name_newchild"));//替换后-子件名称 addNew.set("yem_subname", entry.getString("yem_name_newchild"));//替换后-子件名称
addNew.set("yem_subenname", "yem_englishname");//替换后-子件英文名称 addNew.set("yem_subenname", entry.getString("yem_englishname"));//替换后-子件英文名称
addNew.set("yem_qty", entry.getBigDecimal("yem_qty_new"));//替换后-数量 addNew.set("yem_qty", entry.getBigDecimal("yem_qty_new"));//替换后-数量
} else {//否则变更前对应变更前 } else {//否则变更前对应变更前
addNew.set("yem_parentno", entry.getString("yem_textfield"));//替换前-父件编码 addNew.set("yem_parentno", entry.getString("yem_textfield"));//替换前-父件编码
addNew.set("yem_parentname", entry.getString("yem_name_parent"));//替换前-父项名称 addNew.set("yem_parentname", entry.getString("yem_name_parent"));//替换前-父项名称
addNew.set("yem_subno", entry.getString("yem_child_before"));//替换前-子件编码 addNew.set("yem_subno", entry.getString("yem_child_before"));//替换前-子件编码
addNew.set("yem_subname", entry.getString("yem_name_child"));//替换前-子件名称 addNew.set("yem_subname", entry.getString("yem_name_child"));//替换前-子件名称
addNew.set("yem_subenname", "");//替换前-子件英文名称 addNew.set("yem_subenname", entry.getString("yem_englishname_before"));//替换前-子件英文名称
addNew.set("yem_qty", entry.getBigDecimal("yem_qty_before"));//替换前-数量 addNew.set("yem_qty", entry.getBigDecimal("yem_qty_before"));//替换前-数量
} }

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

@ -51,30 +51,38 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
String plm_parent = plm.getString("yem_textfield");//总成编码 String plm_parent = plm.getString("yem_textfield");//总成编码
String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态 String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
Date bom_completetime = bom.getDate("yem_completetime"); Date bom_completetime = bom.getDate("yem_completetime");
String exestate = bom.getString("yem_exestate");
Date invoktime = plm.getDate("yem_invoktime");//执行时间
Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm); Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm);
exestate = "30".equals(exestate) ? "B" : "A";
if (plmMatchBom != null && !plmMatchBom) { if (plmMatchBom != null && !plmMatchBom) {
Date stoptime = plm.getDate("yem_stoptime"); // Date stoptime = plm.getDate("yem_stoptime");
if (YEM.isEmpty(stoptime)) { Date downdate = bom.getDate("yem_downdate");
Date downdate = bom.getDate("yem_downdate"); if (YEM.isNotEmpty(downdate)) {
plm.set("yem_enablestatus_before", bom_enablesta); plm.set("yem_enablestatus_before", bom_enablesta);
plm.set("yem_stoptime", downdate); plm.set("yem_stoptime", downdate);
plm.set("yem_invoktime", bom_completetime); // plm.set("yem_invoktime", bom_completetime);
plm.set("yem_invokstatus", "B"); // plm.set("yem_invokstatus", exestate);
} else { } else {
logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent); logger.info("停用_无时间，不更新，{}，{}", plm_billno, plm_parent);
} }
} }
if (plmMatchBom != null && plmMatchBom) { if (plmMatchBom != null && plmMatchBom) {
Date starttime = plm.getDate("yem_starttime"); // Date starttime = plm.getDate("yem_starttime");
if (YEM.isEmpty(starttime)) { Date enableddate = bom.getDate("yem_enableddate");
Date enableddate = bom.getDate("yem_enableddate"); if (YEM.isNotEmpty(enableddate)) {
plm.set("yem_enablesta", bom_enablesta); plm.set("yem_enablesta", bom_enablesta);
plm.set("yem_starttime", enableddate); plm.set("yem_starttime", enableddate);
plm.set("yem_invoktime", bom_completetime); // plm.set("yem_invoktime", bom_completetime);
plm.set("yem_invokstatus", "B"); // plm.set("yem_invokstatus", exestate);
if (YEM.isNotEmpty(bom_completetime)) {
plm.set("yem_invoktime", bom_completetime);
plm.set("yem_invokstatus", exestate);
}
} else { } else {
logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent); logger.info("启用_无时间，不更新，{}，{}", plm_billno, plm_parent);
} }
} }
} }