|
@@ -1294,10 +1294,8 @@
|
|
|
)
|
|
)
|
|
|
)
|
|
)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
- console.log(11111111);
|
|
|
|
|
this.$set(row, 'isSave', true);
|
|
this.$set(row, 'isSave', true);
|
|
|
-
|
|
|
|
|
- if (this.formData.bizScene != 5) {
|
|
|
|
|
|
|
+ if (this.formData.bizType != 5) {
|
|
|
this.createMaterialCode(row);
|
|
this.createMaterialCode(row);
|
|
|
} else {
|
|
} else {
|
|
|
// 退还
|
|
// 退还
|
|
@@ -1307,7 +1305,6 @@
|
|
|
.catch((err) => {
|
|
.catch((err) => {
|
|
|
this.$message.error('请填入必填项!');
|
|
this.$message.error('请填入必填项!');
|
|
|
});
|
|
});
|
|
|
- console.log(2);
|
|
|
|
|
},
|
|
},
|
|
|
// 批量设置生产日期
|
|
// 批量设置生产日期
|
|
|
handleSelectionChange(val) {
|
|
handleSelectionChange(val) {
|
|
@@ -1401,6 +1398,9 @@
|
|
|
if (item.warehouseLedgerDetails?.length) {
|
|
if (item.warehouseLedgerDetails?.length) {
|
|
|
item.warehouseLedgerDetails.forEach((i, index) => {
|
|
item.warehouseLedgerDetails.forEach((i, index) => {
|
|
|
this.$set(i, 'num', num);
|
|
this.$set(i, 'num', num);
|
|
|
|
|
+ this.$set(i, 'weight', item.minPackingCount);
|
|
|
|
|
+ this.$set(i, 'weightUtil', item.weightUnit);
|
|
|
|
|
+
|
|
|
if (!item.isUnpack) {
|
|
if (!item.isUnpack) {
|
|
|
if (index < item.warehouseLedgerDetails.length - 1) {
|
|
if (index < item.warehouseLedgerDetails.length - 1) {
|
|
|
num = res1.shift()?.num;
|
|
num = res1.shift()?.num;
|
|
@@ -1421,6 +1421,7 @@
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ console.log('rrrrr', this.warehousingMaterialList);
|
|
|
},
|
|
},
|
|
|
// 入库明细生成条码信息 退还
|
|
// 入库明细生成条码信息 退还
|
|
|
async createMaterialCodeReturn(row) {
|
|
async createMaterialCodeReturn(row) {
|
|
@@ -1568,7 +1569,11 @@
|
|
|
num: item.num,
|
|
num: item.num,
|
|
|
batchNo: item.batchNo,
|
|
batchNo: item.batchNo,
|
|
|
categoryId:
|
|
categoryId:
|
|
|
- this.formData.bizType == 2 ? item.categoryId : item.id,
|
|
|
|
|
|
|
+ this.formData.bizType == 2
|
|
|
|
|
+ ? item.categoryId
|
|
|
|
|
+ ? item.categoryId
|
|
|
|
|
+ : this.formData.extInfo.assetType
|
|
|
|
|
+ : item.id,
|
|
|
count: item.outInNum,
|
|
count: item.outInNum,
|
|
|
minPackingCount: item.minPackingCount,
|
|
minPackingCount: item.minPackingCount,
|
|
|
packingCount: item.outInNum,
|
|
packingCount: item.outInNum,
|