如果装配件有展示顺序,在ptr替换是需要替换目视项

tags/yfai-mes-ext-v2.4
臧学普 6 months ago
parent 5f75e8cfb1
commit bcabf20313

@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.mes.repository.*;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
@ -438,7 +439,14 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
orderAssemblyList = orderAssembly; orderAssemblyList = orderAssembly;
} }
} }
/**
* pisces
* add by aix 2017.4.11 PTRWORKORDERASSEMBLYpartdesc
*/
if (!Objects.isNull(orderAssemblyList)){ if (!Objects.isNull(orderAssemblyList)){
if (orderAssemblyList.getDisplaySeq()!=null && orderAssemblyList.getDisplaySeq()!=0){
orderAssemblyList.setDisplayValue(mesPartPtr.getVisualItem());
}
orderAssemblyList.setAssemblyPartNo(mesPartSap.getPartNo()); orderAssemblyList.setAssemblyPartNo(mesPartSap.getPartNo());
orderAssemblyList.setAssemblyPartName(mesPartSap.getPartName()); orderAssemblyList.setAssemblyPartName(mesPartSap.getPartName());
orderAssemblyList.setMatchRule(mesPartPtr.getReplacePartSnRule()); orderAssemblyList.setMatchRule(mesPartPtr.getReplacePartSnRule());
@ -482,6 +490,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
workOrderPartRao.saveAll(workOrderPartList); workOrderPartRao.saveAll(workOrderPartList);
mesWorkOrder.setProductSeq(productSeq); mesWorkOrder.setProductSeq(productSeq);
mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName()); mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName());
mesWorkOrder.setPtrInfo(ptrInfos.toString());
ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB"); ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
mesWorkOrderRao.insert(mesWorkOrder); mesWorkOrderRao.insert(mesWorkOrder);
/** /**

Loading…
Cancel
Save