Fix defect metadata in batch merge

This commit is contained in:
caoqianming 2026-07-30 13:45:24 +08:00
parent d3e700fcae
commit 41b8e6f29b
6 changed files with 21 additions and 0 deletions

View File

@ -976,6 +976,8 @@ export default {
obj.count = item.count_canhandover; obj.count = item.count_canhandover;
obj.state = res.state; obj.state = res.state;
obj.defect = res.defect; obj.defect = res.defect;
obj.defect_okcate = item.defect_okcate;
obj.tracking = item.material_ && item.material_.tracking;
obj.handoverbw = []; obj.handoverbw = [];
that.$API.wpm.wpr.list.req({wm:item.id,page:0}).then((res) => { that.$API.wpm.wpr.list.req({wm:item.id,page:0}).then((res) => {
let handoverbw = []; let handoverbw = [];

View File

@ -554,6 +554,12 @@ export default {
obj.id = item.id; obj.id = item.id;
obj.wm = item.id; obj.wm = item.id;
obj.batch = item.batch; obj.batch = item.batch;
obj.state = item.state;
obj.defect = item.defect;
obj.defect_okcate = item.defect_okcate;
obj.tracking = item.material_ && item.material_.tracking;
obj.material_ = item.material_;
obj.material = item.material;
obj.process = item.material_.process_name; obj.process = item.material_.process_name;
obj.count_canhandover = item.count_canhandover; obj.count_canhandover = item.count_canhandover;
obj.count = item.count_canhandover; obj.count = item.count_canhandover;

View File

@ -543,6 +543,11 @@ export default {
obj.wm = item.id; obj.wm = item.id;
obj.state = item.state; obj.state = item.state;
obj.batch = item.batch; obj.batch = item.batch;
obj.defect = item.defect;
obj.defect_okcate = item.defect_okcate;
obj.tracking = item.material_ && item.material_.tracking;
obj.material_ = item.material_;
obj.material = item.material;
obj.process = item.material_.process_name; obj.process = item.material_.process_name;
obj.count_canhandover = item.count_canhandover; obj.count_canhandover = item.count_canhandover;
obj.count = item.count_canhandover; obj.count = item.count_canhandover;

View File

@ -911,6 +911,8 @@ export default {
obj.state = item.state; obj.state = item.state;
obj.defect = item.defect; obj.defect = item.defect;
obj.defect_name = item.defect_name; obj.defect_name = item.defect_name;
obj.defect_okcate = item.defect_okcate;
obj.tracking = item.material_ && item.material_.tracking;
obj.count_cando = cando; obj.count_cando = cando;
obj.material = item.material; obj.material = item.material;
that.form.handoverb.push(obj) that.form.handoverb.push(obj)

View File

@ -362,6 +362,9 @@ export default {
obj.batch = item.batch; obj.batch = item.batch;
obj.state = item.state; obj.state = item.state;
obj.defect = item.defect; obj.defect = item.defect;
obj.defect_okcate = item.defect_okcate;
obj.tracking = item.material_ && item.material_.tracking;
obj.material_ = item.material_;
obj.material = item.material; obj.material = item.material;
obj.count_canhandover = item.count_canhandover; obj.count_canhandover = item.count_canhandover;
obj.count = item.count_canhandover; obj.count = item.count_canhandover;

View File

@ -434,6 +434,9 @@ export default {
obj.batch = item.batch; obj.batch = item.batch;
obj.state = item.state; obj.state = item.state;
obj.defect = item.defect; obj.defect = item.defect;
obj.defect_okcate = item.defect_okcate;
obj.tracking = item.material_ && item.material_.tracking;
obj.material_ = item.material_;
obj.material = item.material; obj.material = item.material;
obj.count_canhandover = item.count_canhandover; obj.count_canhandover = item.count_canhandover;
obj.count = item.count_canhandover; obj.count = item.count_canhandover;