Commit 7fb4636a6fc250b21edad81d17c141798700e68b

Authored by Min
1 parent 2eca352a

1.跨版提前下料,如果bAdvance是false,那么把托盘计数的dQty放到dAdvanceReportQty跨班提前下料产量上

src/components/Common/CommonInstructSet.js
@@ -251,7 +251,7 @@ const instructSetInit = async props => { @@ -251,7 +251,7 @@ const instructSetInit = async props => {
251 ...resultData 251 ...resultData
252 }; 252 };
253 } 253 }
254 - 254 +
255 } catch (error) { 255 } catch (error) {
256 props.btnConfig.error? props.btnConfig.error(error) : ''; 256 props.btnConfig.error? props.btnConfig.error(error) : '';
257 throw new Error(error); 257 throw new Error(error);
@@ -1883,7 +1883,12 @@ const handlePoprepair = async (props, instruct) => { @@ -1883,7 +1883,12 @@ const handlePoprepair = async (props, instruct) => {
1883 index = tableData.findIndex(item => item.sId === record.sId); 1883 index = tableData.findIndex(item => item.sId === record.sId);
1884 } 1884 }
1885 1885
  1886 + const oDTrayQty = document.querySelector("#MesDynamicNum_dTrayQty");
  1887 + const dQty = (!oDTrayQty) ? 0 : Number(oDTrayQty.innerHTML?.replace(/\,/g, ""));
1886 const fieldNameList = fieldNames.split(","); 1888 const fieldNameList = fieldNames.split(",");
  1889 + if(dQty && !record.bAdvance && title.includes("跨班提前下料")){
  1890 + record.dAdvanceReportQty = dQty; /* 跨班提前下料产量 */
  1891 + }
1887 1892
1888 const filterConfig = config?.gdsconfigformslave?.filter(item => { 1893 const filterConfig = config?.gdsconfigformslave?.filter(item => {
1889 return fieldNameList.includes(item.sName); 1894 return fieldNameList.includes(item.sName);
@@ -2513,7 +2518,7 @@ const utils = { @@ -2513,7 +2518,7 @@ const utils = {
2513 return tableData[0]; 2518 return tableData[0];
2514 } else if (filterType === "last") { 2519 } else if (filterType === "last") {
2515 return tableData[tableData.length - 1]; 2520 return tableData[tableData.length - 1];
2516 - } 2521 + }
2517 2522
2518 return tableData; 2523 return tableData;
2519 }, 2524 },