xlyErp / xlyUmi

Commit ffb3bd83132ed2b6bd0649165f769d504f33eede

Authored by Min
1 parent 7f97ea9c

1.工单不要算箱包数

Inline Side-by-side
Showing 1 changed file with 13 additions and 5 deletions
src/components/Common/commonBusiness.js
  View file @ffb3bd8
... ... @@ -1563,6 +1563,12 @@ export function getCalculateAllMoney(app, type, sFieldName, masterData, tableDat
1563 1563 const sCkxDirectSolutionPack = commonUtils.isNotEmptyObject(app.systemData) && commonUtils.isNotEmptyObject(app.systemData.filter(item => item.sName === 'CkxDirectSolutionPack')) ?
1564 1564 app.systemData.filter(item => item.sName === 'CkxDirectSolutionPack')[0].sValue : '0'; /* 默认反算 */
1565 1565  
  1566 + const hasWork = location.pathname?.toLowerCase()?.includes('workorder');
  1567 + const hasQuo = location.pathname?.toLowerCase()?.includes('quotation');
  1568 + // const bCalPack = !hasWork && !hasQuo;
  1569 + const bCalPack = !hasWork;
  1570 + console.log('bbb2222', bCalPack, hasWork, sCkxDirectSolutionPack);
  1571 +
1566 1572 if (sFieldName === 'sMaterialsStyle' || sFieldName === 'sMaterialsName' || sFieldName === 'dAuxiliaryQty' || sFieldName === `d${type}Price` || sFieldName === `dN${type}Price` || sFieldName === `d${type}ForeignPrice` || sFieldName === 'sTaxId' || sFieldName === 'sTaxName' || sFieldName === 'sSupplyId' || sFieldName === 'sSupplyName' || sFieldName === 'sProcessName') {
1567 1573 if (type === 'Product') {
1568 1574 tableDataRow = getCalculateByPriceNew(app, type, masterData, tableDataRow, sFieldName);
... ... @@ -1570,10 +1576,12 @@ export function getCalculateAllMoney(app, type, sFieldName, masterData, tableDat
1570 1576 tableDataRow = getCalculateByPrice(app, type, masterData, tableDataRow, sFieldName);
1571 1577 }
1572 1578 } else if (sFieldName === `d${type}Qty`) {
1573   - if (sCkxDirectSolutionPack === '0') { /* 箱包反算 */
1574   - tableDataRow = getCalculatedReserveBags(tableDataRow, sFieldName);
1575   - } else { /* 箱包正算 */
1576   - tableDataRow = getCalculatedReserveBags1(tableDataRow, sFieldName);
  1579 + if (bCalPack) {
  1580 + if (sCkxDirectSolutionPack === '0') { /* 箱包反算 */
  1581 + tableDataRow = getCalculatedReserveBags(tableDataRow, sFieldName);
  1582 + } else { /* 箱包正算 */
  1583 + tableDataRow = getCalculatedReserveBags1(tableDataRow, sFieldName);
  1584 + }
1577 1585 }
1578 1586  
1579 1587 if (type === 'Product') {
... ... @@ -1599,7 +1607,7 @@ export function getCalculateAllMoney(app, type, sFieldName, masterData, tableDat
1599 1607 tableDataRow = getCalculateNoTaxMoney(app, masterData, tableDataRow, type);
1600 1608 } else if (sFieldName === 'dAuxiliaryLossQty' || sFieldName === 'dLossQty') {
1601 1609 tableDataRow = getCalculatedLossMoney(app, masterData, tableDataRow, type);
1602   - } else if (sFieldName === 'dTrunkQty' || sFieldName === 'dFractionQty' || sFieldName === 'dPackQty' || sFieldName === 'dGiveQty') {
  1610 + } else if (bCalPack && (sFieldName === 'dTrunkQty' || sFieldName === 'dFractionQty' || sFieldName === 'dPackQty' || sFieldName === 'dGiveQty')) {
1603 1611 if (sCkxDirectSolutionPack === '0') { /* 箱包反算 */
1604 1612 tableDataRow = getCalculatedReserveBags(tableDataRow, sFieldName);
1605 1613 } else { /* 箱包正算 */
... ...