|
@@ -920,9 +920,7 @@
|
|
|
let pData2 = {
|
|
let pData2 = {
|
|
|
type: this.wwType,
|
|
type: this.wwType,
|
|
|
taskIds: this.extractedList.map((item) => item.taskId),
|
|
taskIds: this.extractedList.map((item) => item.taskId),
|
|
|
- workOrderIds: this.extractedList.map((item) => item.workOrderId),
|
|
|
|
|
- taskIds: this.form.productList.map((item) => item.taskId),
|
|
|
|
|
- workOrderIds: this.form.productList.map((item) => item.workOrderId)
|
|
|
|
|
|
|
+ workOrderIds: this.extractedList.map((item) => item.workOrderId)
|
|
|
};
|
|
};
|
|
|
storageApi
|
|
storageApi
|
|
|
.getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
|
|
.getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
|
|
@@ -955,9 +953,7 @@
|
|
|
let pData2 = {
|
|
let pData2 = {
|
|
|
type: this.wwType,
|
|
type: this.wwType,
|
|
|
taskIds: this.extractedList.map((item) => item.taskId),
|
|
taskIds: this.extractedList.map((item) => item.taskId),
|
|
|
- workOrderIds: this.extractedList.map((item) => item.workOrderId),
|
|
|
|
|
- taskIds: this.form.productList.map((item) => item.taskId),
|
|
|
|
|
- workOrderIds: this.form.productList.map((item) => item.workOrderId)
|
|
|
|
|
|
|
+ workOrderIds: this.extractedList.map((item) => item.workOrderId)
|
|
|
};
|
|
};
|
|
|
storageApi
|
|
storageApi
|
|
|
.getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
|
|
.getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
|
|
@@ -968,7 +964,29 @@
|
|
|
console.log(err);
|
|
console.log(err);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
+ if (this.form.productList?.length > 0) {
|
|
|
|
|
+ this.getStaffList({ id: this.form.deptId }).then(() => {
|
|
|
|
|
+ this.formData.fromId = this.form.makerId;
|
|
|
|
|
+ this.formData.fromUser = this.form.makerName;
|
|
|
|
|
+ this.formData.extInfo.verifyDeptCode = this.form.deptId;
|
|
|
|
|
+ this.formData.extInfo.verifyDeptName = this.form.deptName;
|
|
|
|
|
+ });
|
|
|
|
|
+ let pData2 = {
|
|
|
|
|
+ type: 3,
|
|
|
|
|
+ taskIds: this.form.productList.map((item) => item.taskId),
|
|
|
|
|
+ workOrderIds: [this.form.sourceId]
|
|
|
|
|
+ };
|
|
|
|
|
+ storageApi
|
|
|
|
|
+ .getHierarchyFifo(pData2)
|
|
|
|
|
+ .then((data) => {
|
|
|
|
|
+ this.detailData(data, this.dimension);
|
|
|
|
|
+ })
|
|
|
|
|
+ .catch((err) => {
|
|
|
|
|
+ console.log(err);
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
|
|
+
|
|
|
// 初始化部门数据
|
|
// 初始化部门数据
|
|
|
initDeptData() {
|
|
initDeptData() {
|
|
|
return new Promise(async (resolve) => {
|
|
return new Promise(async (resolve) => {
|