|
|
@@ -2110,7 +2110,7 @@ function tableDataRemake(changeListData) {
|
|
|
let pushbwmx = '0*;*0';
|
|
|
if (listinfo.leafXmjs !== undefined) {
|
|
|
const leafInfo = listinfo.leafXmjs.find(function (item) {
|
|
|
- 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));
|
|
|
+ const flag = (item.bwmx === undefined || item.bwmx === clinfo.bwmx || item.jldy === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && (!clinfo.mx_id || (item.mx_id && clinfo.mx_id && item.mx_id === clinfo.mx_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;
|
|
|
}
|
|
|
@@ -2150,13 +2150,14 @@ function tableDataRemake(changeListData) {
|
|
|
let pushbwmx = '0*;*0';
|
|
|
if (listinfo.leafXmjs !== undefined) {
|
|
|
const leafInfo = listinfo.leafXmjs.find(function (item) {
|
|
|
- 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));
|
|
|
+ const flag = (item.bwmx === undefined || item.bwmx === clinfo.bwmx || item.jldy === clinfo.bwmx) && item.gcl_id === clinfo.gcl_id && (!clinfo.mx_id || (item.mx_id && clinfo.mx_id && item.mx_id === clinfo.mx_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) {
|
|
|
+ console.log(leafInfo, clinfo);
|
|
|
info = leafInfo;
|
|
|
pushbwmx = leafInfo.code + '!_!' + (leafInfo.jldy !== undefined ? leafInfo.jldy : '') + '!_!' +
|
|
|
(leafInfo.dwgc ? leafInfo.dwgc : '') + '!_!' +
|
|
|
@@ -2345,7 +2346,7 @@ function remakeChangeSpread(cOrder = changeOrder) {
|
|
|
};
|
|
|
const radionInfo = changeList.find(function (info) {
|
|
|
//return info.code === code && (info.lid == lid || parseInt(info.lid) === parseInt(lindex)) && gcl_id == info.gcl_id && (info.bwmx === bwmx || (info.bwmx === xmj_jldy && info.mx_id && info.mx_id === mx_id)) && parseInt(info.oamount) === parseInt(oamount);
|
|
|
- return (info.lid == lid || parseInt(info.lid) === parseInt(lindex)) && gcl_id == info.gcl_id && (info.bwmx === bwmx || (info.bwmx === xmj_jldy && info.mx_id && info.mx_id === mx_id));
|
|
|
+ return (info.lid == lid || parseInt(info.lid) === parseInt(lindex)) && gcl_id == info.gcl_id && (!mx_id || (mx_id && info.mx_id && info.mx_id === mx_id)) && (info.bwmx === bwmx || info.bwmx === xmj_jldy);
|
|
|
});
|
|
|
if (radionInfo) {
|
|
|
trlist.camount = radionInfo.camount;
|
