Commit a514f1d621c8ff4e2c54feb855e78ebae7243af7
1 parent
64cf7c68
扫码上料
Showing
1 changed file
with
12 additions
and
1 deletions
src/mes/common/commonOperationBarComponent/index.js
| @@ -1336,6 +1336,7 @@ const CommonOperationBarComponent = basProps => { | @@ -1336,6 +1336,7 @@ const CommonOperationBarComponent = basProps => { | ||
| 1336 | document.body.removeEventListener("keypress", keypressEvent); | 1336 | document.body.removeEventListener("keypress", keypressEvent); |
| 1337 | }; | 1337 | }; |
| 1338 | }, []); | 1338 | }, []); |
| 1339 | + | ||
| 1339 | return ( | 1340 | return ( |
| 1340 | <div className={styles.commonOperationBar}> | 1341 | <div className={styles.commonOperationBar}> |
| 1341 | <div className="leftBar"> | 1342 | <div className="leftBar"> |
| @@ -1505,11 +1506,21 @@ const BarcodeComponent = props => { | @@ -1505,11 +1506,21 @@ const BarcodeComponent = props => { | ||
| 1505 | props.onExecInstructSet({ | 1506 | props.onExecInstructSet({ |
| 1506 | btnConfig, | 1507 | btnConfig, |
| 1507 | nextProps: { scanCodeData: [{ value: valueNew }] }, | 1508 | nextProps: { scanCodeData: [{ value: valueNew }] }, |
| 1508 | - callback: () => { | 1509 | + // callback: () => { |
| 1510 | + // if (commonUtils.isNotEmptyArr(searchProductConfig)) { | ||
| 1511 | + // props.onSaveState({ | ||
| 1512 | + // refreshMachineDataFlag: new Date().getTime(), | ||
| 1513 | + // productionTableList: [sName] | ||
| 1514 | + // }); | ||
| 1515 | + // } | ||
| 1516 | + // }, | ||
| 1517 | + inscallback: nextProps => { | ||
| 1509 | if (commonUtils.isNotEmptyArr(searchProductConfig)) { | 1518 | if (commonUtils.isNotEmptyArr(searchProductConfig)) { |
| 1510 | props.onSaveState({ | 1519 | props.onSaveState({ |
| 1511 | refreshMachineDataFlag: new Date().getTime(), | 1520 | refreshMachineDataFlag: new Date().getTime(), |
| 1512 | productionTableList: [sName] | 1521 | productionTableList: [sName] |
| 1522 | + }, ()=>{ | ||
| 1523 | + props.onRefresh && props.onRefresh(); | ||
| 1513 | }); | 1524 | }); |
| 1514 | } | 1525 | } |
| 1515 | } | 1526 | } |