|
@@ -327,9 +327,9 @@ $(function () {
|
|
|
for (const one of insertGcl) {
|
|
|
if (one.leafXmjs && one.leafXmjs.length > 0) {
|
|
|
for (const xmj of one.leafXmjs) {
|
|
|
- const is_self = _.findIndex(selfList, { gcl_id: xmj.gcl_id, xmj_id: xmj.id, mx_id: xmj.mx_id ? xmj.mx_id : null }) !== -1;// 区分单独计量的明细工料含量
|
|
|
+ const is_self = _.findIndex(selfList, { gcl_id: xmj.gcl_id, xmj_id: xmj.id, mx_id: xmj.mx_id ? xmj.mx_id : '' }) !== -1;// 区分单独计量的明细工料含量
|
|
|
if (is_self) {
|
|
|
- const billsList = _.filter(materialListForSelf, { gcl_id: xmj.gcl_id, xmj_id: xmj.id, mx_id: xmj.mx_id ? xmj.mx_id : null });
|
|
|
+ const billsList = _.filter(materialListForSelf, { gcl_id: xmj.gcl_id, xmj_id: xmj.id, mx_id: xmj.mx_id ? xmj.mx_id : '' });
|
|
|
for (const bill of billsList) {
|
|
|
if (!_.find(hadQtySelfList, bill)) {
|
|
|
hadQtySelfList.push(bill);
|
|
@@ -415,7 +415,6 @@ $(function () {
|
|
|
const is_self = _.findIndex(selfList, { gcl_id: xmj.gcl_id, xmj_id: xmj.id, mx_id: xmj.mx_id ? xmj.mx_id : null }) !== -1;// 区分单独计量的明细工料含量
|
|
|
if (is_self) {
|
|
|
const billsList = _.filter(materialListForSelf, { gcl_id: xmj.gcl_id, xmj_id: xmj.id, mx_id: xmj.mx_id ? xmj.mx_id : null });
|
|
|
- console.log(billsList);
|
|
|
for (const bill of billsList) {
|
|
|
hadQtySelfList.push(bill);
|
|
|
insertSelfList.push({
|