|
|
@@ -911,7 +911,11 @@ function tableDataRemake(changeListData) {
|
|
|
let pushbwmx = '0*;*0';
|
|
|
if (listinfo.leafXmjs !== undefined) {
|
|
|
const leafInfo = listinfo.leafXmjs.find(function (item) {
|
|
|
- return (item.bwmx === undefined || item.bwmx === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && item.code === clinfo.xmj_code && (item.quantity !== null ? item.quantity === parseFloat(clinfo.oamount) : 0 === parseFloat(clinfo.oamount));
|
|
|
+ const flag = (item.bwmx === undefined || item.bwmx === clinfo.bwmx || item.jldy === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && (item.quantity !== null ? item.quantity === parseFloat(clinfo.oamount) : 0 === parseFloat(clinfo.oamount));
|
|
|
+ if (flag && item.code === clinfo.xmj_code) {
|
|
|
+ return flag && item.code === clinfo.xmj_code;
|
|
|
+ }
|
|
|
+ return flag;
|
|
|
});
|
|
|
if (leafInfo) {
|
|
|
pushbwmx = leafInfo.code + '!_!' + (leafInfo.jldy !== undefined ? leafInfo.jldy : '') + '!_!' +
|
|
|
@@ -942,7 +946,11 @@ function tableDataRemake(changeListData) {
|
|
|
let pushbwmx = '0*;*0';
|
|
|
if (listinfo.leafXmjs !== undefined) {
|
|
|
const leafInfo = listinfo.leafXmjs.find(function (item) {
|
|
|
- return (item.bwmx === undefined || item.bwmx === clinfo.bwmx || item.jldy === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && item.code === clinfo.xmj_code && (item.quantity !== null ? item.quantity === parseFloat(clinfo.oamount) : 0 === parseFloat(clinfo.oamount));
|
|
|
+ const flag = (item.bwmx === undefined || item.bwmx === clinfo.bwmx || item.jldy === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && (item.quantity !== null ? item.quantity === parseFloat(clinfo.oamount) : 0 === parseFloat(clinfo.oamount));
|
|
|
+ if (flag && item.code === clinfo.xmj_code) {
|
|
|
+ return flag && item.code === clinfo.xmj_code;
|
|
|
+ }
|
|
|
+ return flag;
|
|
|
});
|
|
|
if (leafInfo) {
|
|
|
pushbwmx = leafInfo.code + '!_!' + (leafInfo.jldy !== undefined ? leafInfo.jldy : '') + '!_!' +
|
