Commit 95dc5b368b72806ce54894c474ed591785b39a0d
1 parent
1237bc85
1.处理MES上料执行界面刷新
Showing
1 changed file
with
56 additions
and
51 deletions
src/mes/common/commonOperationBarComponent/index.js
| @@ -1569,58 +1569,63 @@ const BarcodeComponent = props => { | @@ -1569,58 +1569,63 @@ const BarcodeComponent = props => { | ||
| 1569 | item => item.sName === "sSearchProductName" | 1569 | item => item.sName === "sSearchProductName" |
| 1570 | ); | 1570 | ); |
| 1571 | 1571 | ||
| 1572 | - props.onExecInstructSet({ | ||
| 1573 | - btnConfig, | ||
| 1574 | - nextProps: { scanCodeData: [{ value: valueNew }] }, | ||
| 1575 | - // callback: () => { | ||
| 1576 | - // if (commonUtils.isNotEmptyArr(searchProductConfig)) { | ||
| 1577 | - // props.onSaveState({ | ||
| 1578 | - // refreshMachineDataFlag: new Date().getTime(), | ||
| 1579 | - // productionTableList: [sName] | ||
| 1580 | - // }); | ||
| 1581 | - // } | ||
| 1582 | - // }, | ||
| 1583 | - inscallback: nextProps => { | ||
| 1584 | - if (commonUtils.isNotEmptyArr(searchProductConfig)) { | ||
| 1585 | - props.onSaveState({ | ||
| 1586 | - refreshMachineDataFlag: new Date().getTime(), | ||
| 1587 | - productionTableList: [sName] | ||
| 1588 | - }, () => { | ||
| 1589 | - props.onRefresh && props.onRefresh(); | ||
| 1590 | - }); | 1572 | + try { |
| 1573 | + props.onExecInstructSet({ | ||
| 1574 | + btnConfig, | ||
| 1575 | + nextProps: {scanCodeData: [{value: valueNew}]}, | ||
| 1576 | + // callback: () => { | ||
| 1577 | + // if (commonUtils.isNotEmptyArr(searchProductConfig)) { | ||
| 1578 | + // props.onSaveState({ | ||
| 1579 | + // refreshMachineDataFlag: new Date().getTime(), | ||
| 1580 | + // productionTableList: [sName] | ||
| 1581 | + // }); | ||
| 1582 | + // } | ||
| 1583 | + // }, | ||
| 1584 | + inscallback: nextProps => { | ||
| 1585 | + if (commonUtils.isNotEmptyArr(searchProductConfig)) { | ||
| 1586 | + props.onSaveState({ | ||
| 1587 | + refreshMachineDataFlag: new Date().getTime(), | ||
| 1588 | + productionTableList: [sName] | ||
| 1589 | + }, () => { | ||
| 1590 | + // props.onRefresh && props.onRefresh(); | ||
| 1591 | + }); | ||
| 1592 | + } | ||
| 1591 | } | 1593 | } |
| 1592 | - } | ||
| 1593 | - // inscallback: nextProps => { | ||
| 1594 | - // if (commonUtils.isNotEmptyArr(searchProductConfig)) { | ||
| 1595 | - // const { machinedataData } = nextProps; | ||
| 1596 | - // if (commonUtils.isNotEmptyArr(machinedataData)) { | ||
| 1597 | - // const { | ||
| 1598 | - // sProductId, | ||
| 1599 | - // sProductNo, | ||
| 1600 | - // sSearchProductId = sProductId, | ||
| 1601 | - // sSearchProductNo = sProductNo | ||
| 1602 | - // } = machinedataData[0]; | ||
| 1603 | - // nextProps.onSaveState( | ||
| 1604 | - // { | ||
| 1605 | - // workOrderInfoData: machinedataData, | ||
| 1606 | - // sSearchProductId: sSearchProductId | ||
| 1607 | - // }, | ||
| 1608 | - // nextPropsNew => { | ||
| 1609 | - // props.onSearchProductNameChange( | ||
| 1610 | - // "", | ||
| 1611 | - // "", | ||
| 1612 | - // { | ||
| 1613 | - // sSearchProductId, | ||
| 1614 | - // sSearchProductNo | ||
| 1615 | - // }, | ||
| 1616 | - // true | ||
| 1617 | - // ); | ||
| 1618 | - // } | ||
| 1619 | - // ); | ||
| 1620 | - // } | ||
| 1621 | - // } | ||
| 1622 | - // } | ||
| 1623 | - }); | 1594 | + // inscallback: nextProps => { |
| 1595 | + // if (commonUtils.isNotEmptyArr(searchProductConfig)) { | ||
| 1596 | + // const { machinedataData } = nextProps; | ||
| 1597 | + // if (commonUtils.isNotEmptyArr(machinedataData)) { | ||
| 1598 | + // const { | ||
| 1599 | + // sProductId, | ||
| 1600 | + // sProductNo, | ||
| 1601 | + // sSearchProductId = sProductId, | ||
| 1602 | + // sSearchProductNo = sProductNo | ||
| 1603 | + // } = machinedataData[0]; | ||
| 1604 | + // nextProps.onSaveState( | ||
| 1605 | + // { | ||
| 1606 | + // workOrderInfoData: machinedataData, | ||
| 1607 | + // sSearchProductId: sSearchProductId | ||
| 1608 | + // }, | ||
| 1609 | + // nextPropsNew => { | ||
| 1610 | + // props.onSearchProductNameChange( | ||
| 1611 | + // "", | ||
| 1612 | + // "", | ||
| 1613 | + // { | ||
| 1614 | + // sSearchProductId, | ||
| 1615 | + // sSearchProductNo | ||
| 1616 | + // }, | ||
| 1617 | + // true | ||
| 1618 | + // ); | ||
| 1619 | + // } | ||
| 1620 | + // ); | ||
| 1621 | + // } | ||
| 1622 | + // } | ||
| 1623 | + // } | ||
| 1624 | + }); | ||
| 1625 | + } finally { | ||
| 1626 | + console.log('finily-上料执行界面刷新：'); | ||
| 1627 | + props.onRefresh && props.onRefresh(); | ||
| 1628 | + } | ||
| 1624 | }; | 1629 | }; |
| 1625 | 1630 | ||
| 1626 | // 判断是否扫码枪输入 | 1631 | // 判断是否扫码枪输入 |