|
|
@@ -1447,19 +1447,22 @@ $(document).ready(() => {
|
|
|
if (!gcl) gcl = gclGatherData[$(this).data('gcl')];
|
|
|
if (!gcl || !gcl.cid) continue;
|
|
|
|
|
|
- let data_bwmx = $(tr).attr('data-bwmx').split(recSpr);
|
|
|
- data_bwmx = data_bwmx.filter(x => {
|
|
|
- const rec = x.split(qtySpr);
|
|
|
- const info = rec[0].split(infoSpr);
|
|
|
- if (info.length < 8) return true;
|
|
|
+ let data_bwmx = [];
|
|
|
+ if ($(tr).attr('data-bwmx') !== '') {
|
|
|
+ data_bwmx = $(tr).attr('data-bwmx').split(recSpr);
|
|
|
+ data_bwmx = data_bwmx.filter(x => {
|
|
|
+ const rec = x.split(qtySpr);
|
|
|
+ const info = rec[0].split(infoSpr);
|
|
|
+ if (info.length < 8) return true;
|
|
|
|
|
|
- const leaf = gcl.leafXmjs.find(lx => { return lx.mx_id === info[6]});
|
|
|
- return !leaf || !leaf.cid;
|
|
|
- });
|
|
|
+ const leaf = gcl.leafXmjs.find(lx => { return lx.mx_id === info[6]});
|
|
|
+ return !leaf || !leaf.cid;
|
|
|
+ });
|
|
|
+ }
|
|
|
for (const [index, leaf] of gcl.leafXmjs.entries()) {
|
|
|
if (!leaf.cid) continue;
|
|
|
|
|
|
- const bwmx = [leaf.code, leaf.jldy || '', leaf.dwgc || '', leaf.fbgc || '', leaf.fxgc || '', leaf.gcl_id, leaf.mx_id, leaf.bwmx || ''];
|
|
|
+ const bwmx = [leaf.code, leaf.jldy || '', leaf.dwgc || '', leaf.fbgc || '', leaf.fxgc || '', leaf.gcl_id, leaf.mx_id, leaf.jldy || ''];
|
|
|
const de_qu = bwmx.join(infoSpr) + qtySpr + (leaf.quantity || 0);
|
|
|
data_bwmx.push(de_qu);
|
|
|
}
|
|
|
@@ -1911,7 +1914,7 @@ function remakeChangeSpread(cOrder = changeOrder) {
|
|
|
mx_id,
|
|
|
};
|
|
|
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.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));
|
|
|
});
|
|
|
if (radionInfo) {
|
