|
@@ -381,7 +381,7 @@ $(document).ready(() => {
|
|
|
const sheet = ledgerSpread.getActiveSheet();
|
|
|
const select = SpreadJsObj.getSelectObject(sheet);
|
|
|
const gclIndex = _.findIndex(gclGatherData, { b_code: select.b_code, name: select.name, unit: select.unit, unit_price: select.unit_price });
|
|
|
- const gcl = gclGatherData[gclIndex].leafXmjs;
|
|
|
+ const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
|
|
|
const index = materialChecklistData.indexOf(select);
|
|
|
const datas = [];
|
|
|
for (const xmj of gcl) {
|
|
@@ -416,7 +416,7 @@ $(document).ready(() => {
|
|
|
const select = SpreadJsObj.getSelectObject(sheet);
|
|
|
const index = materialChecklistData.indexOf(select);
|
|
|
const gclIndex = _.findIndex(gclGatherData, { b_code: select.b_code, name: select.name, unit: select.unit, unit_price: select.unit_price });
|
|
|
- const gcl = gclGatherData[gclIndex].leafXmjs;
|
|
|
+ const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
|
|
|
const datas = [];
|
|
|
for (const xmj of gcl) {
|
|
|
const data = {
|
|
@@ -498,7 +498,7 @@ $(document).ready(() => {
|
|
|
const ledgerSheet = ledgerSpread.getActiveSheet();
|
|
|
const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
|
|
|
const gclIndex = _.findIndex(gclGatherData, { b_code: ledgerSelect.b_code, name: ledgerSelect.name, unit: ledgerSelect.unit, unit_price: ledgerSelect.unit_price });
|
|
|
- const gcl = gclGatherData[gclIndex].leafXmjs;
|
|
|
+ const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
|
|
|
const datas = [];
|
|
|
for (const xmj of gcl) {
|
|
|
const data = {
|
|
@@ -595,7 +595,7 @@ $(document).ready(() => {
|
|
|
const ledgerSheet = ledgerSpread.getActiveSheet();
|
|
|
const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
|
|
|
const gclIndex = _.findIndex(gclGatherData, { b_code: ledgerSelect.b_code, name: ledgerSelect.name, unit: ledgerSelect.unit, unit_price: ledgerSelect.unit_price });
|
|
|
- const gcl = gclGatherData[gclIndex].leafXmjs;
|
|
|
+ const gcl = gclGatherData[gclIndex].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
|
|
|
const datas = [];
|
|
|
for (const xmj of gcl) {
|
|
|
const data2 = {
|