sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改记录修改数量赋值问题

wms3.0_pda
lijuncheng 10 months ago
parent
a6dba9f145
commit
478628aa87
10 changed files with 190 additions and 147 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      pages/deliver/record/deliverRecord.vue
  2. 41
      pages/productPutaway/record/productPutawayRecord.vue
  3. 41
      pages/productReceipt/record/productReceiptRecord.vue
  4. 1
      pages/productionReceipt/record/productionReceiptRecord.vue
  5. 42
      pages/productionReturn/record/returnToHold.vue
  6. 37
      pages/productionReturn/record/returnToStore.vue
  7. 33
      pages/purchaseReturn/record/returnRecord.vue
  8. 35
      pages/transfer/coms/comTransferRecord.vue
  9. 37
      pages/unPlanned/record/issueRecord.vue
  10. 31
      pages/unPlanned/record/receiptRecord.vue

39
pages/deliver/record/deliverRecord.vue
View File

@ -60,7 +60,8 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
getPackingNumberAndBatchByList getPackingNumberAndBatchByList,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -359,32 +360,36 @@
if (detail.scaned) { if (detail.scaned) {
var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch); detail.packingNumber, detail.toLocationCode, detail.batch);
detail.itemCode = detail.itemCode; var submitItem = deepCopyData(detail)
detail.itemName = detail.package.itemName; submitItem.itemCode = detail.itemCode;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemName = detail.package.itemName;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc1 = detail.package.itemDesc1;
submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = info.packingNumber; submitItem.fromPackingNumber = info.packingNumber;
detail.toPackingNumber = info.packingNumber; submitItem.toPackingNumber = info.packingNumber;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = info.batch; submitItem.fromBatch = info.batch;
detail.toBatch = info.batch; submitItem.toBatch = info.batch;
detail.fromLocationCode = detail.locationCode; submitItem.fromLocationCode = detail.locationCode;
detail.toLocationCode = detail.toLocationCode; submitItem.toLocationCode = detail.toLocationCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
submitItem.package ="";
subList.push(submitItem)
} }
}) })
}) })
this.dataContent.subList = subList; this.dataContent.subList = subList;
this.dataContent.creator = creator; this.dataContent.creator = creator;
this.dataContent.customerCode =this.customerCode; this.dataContent.customerCode = this.customerCode;
this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode; this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
this.dataContent.toWarehouseCode = this.toWarehouseCode; this.dataContent.toWarehouseCode = this.toWarehouseCode;
return this.dataContent; return this.dataContent;

41
pages/productPutaway/record/productPutawayRecord.vue
View File

@ -46,7 +46,8 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
getPackingNumberAndBatchByList getPackingNumberAndBatchByList,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getPrecisionStrategyList getPrecisionStrategyList
@ -312,28 +313,31 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
var submitItem = deepCopyData(detail)
var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch); detail.packingNumber, detail.toLocationCode, detail.batch);
detail.itemCode = detail.itemCode; submitItem.itemCode = detail.itemCode;
detail.itemName = detail.package.itemName; submitItem.itemName = detail.package.itemName;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemDesc1 = detail.package.itemDesc1;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = info.packingNumber; submitItem.fromPackingNumber = info.packingNumber;
detail.toPackingNumber = info.packingNumber; submitItem.toPackingNumber = info.packingNumber;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = info.batch; submitItem.fromBatch = info.batch;
detail.toBatch = info.batch; submitItem.toBatch = info.batch;
detail.fromLocationCode = detail.locationCode; submitItem.fromLocationCode = detail.locationCode;
detail.toLocationCode = detail.toLocationCode; submitItem.toLocationCode = detail.toLocationCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
submitItem.package ="";
subList.push(submitItem)
} }
}) })
}) })
@ -377,6 +381,11 @@
}, },
getToLocationCode(location, code) { getToLocationCode(location, code) {
this.toLocationCode = code; this.toLocationCode = code;
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = this.toLocationCode
})
})
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {

41
pages/productReceipt/record/productReceiptRecord.vue
View File

@ -57,7 +57,8 @@
} from '@/common/balance.js'; } from '@/common/balance.js';
import { import {
goHome, goHome,
getPackingNumberAndBatchByList getPackingNumberAndBatchByList,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -300,31 +301,35 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
var submitItem = deepCopyData(detail)
var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch); detail.packingNumber, detail.toLocationCode, detail.batch);
detail.itemCode = detail.itemCode; submitItem.itemCode = detail.itemCode;
detail.itemName = detail.package.itemName; submitItem.itemName = detail.package.itemName;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemDesc1 = detail.package.itemDesc1;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = info.packingNumber; submitItem.fromPackingNumber = info.packingNumber;
detail.toPackingNumber = info.packingNumber; submitItem.toPackingNumber = info.packingNumber;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = info.batch; submitItem.fromBatch = info.batch;
detail.toBatch = info.batch; submitItem.toBatch = info.batch;
detail.fromLocationCode = detail.locationCode; submitItem.fromLocationCode = detail.locationCode;
detail.toLocationCode = detail.toLocationCode; submitItem.toLocationCode = detail.toLocationCode;
detail.productionlineCode = this.productionLineCode; submitItem.productionlineCode = this.productionLineCode;
detail.workStationCode = this.workStationCode; submitItem.workStationCode = this.workStationCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
submitItem.package ="";
subList.push(submitItem)
} }
}) })
}) })

1
pages/productionReceipt/record/productionReceiptRecord.vue
View File

@ -47,6 +47,7 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {

42
pages/productionReturn/record/returnToHold.vue
View File

@ -58,7 +58,8 @@
import { import {
goHome, goHome,
getPackingNumberAndBatchByList getPackingNumberAndBatchByList,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -388,34 +389,37 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
var submitItem = deepCopyData(detail)
var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
detail.packingNumber, detail.fromLocationCode, detail.batch); detail.packingNumber, detail.fromLocationCode, detail.batch);
var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch); detail.packingNumber, detail.toLocationCode, detail.batch);
detail.itemCode = detail.itemCode; submitItem.itemCode = detail.itemCode;
detail.itemName = detail.package.itemName; submitItem.itemName = detail.package.itemName;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemDesc1 = detail.package.itemDesc1;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = fromInfo.packingNumber; submitItem.fromPackingNumber = fromInfo.packingNumber;
detail.toPackingNumber = toInfo.packingNumber; submitItem.toPackingNumber = toInfo.packingNumber;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = fromInfo.batch; submitItem.fromBatch = fromInfo.batch;
detail.toBatch = toInfo.batch; submitItem.toBatch = toInfo.batch;
detail.fromLocationCode = detail.fromLocationCode; submitItem.fromLocationCode = detail.fromLocationCode;
detail.toLocationCode = detail.toLocationCode; submitItem.toLocationCode = detail.toLocationCode;
detail.productionlineCode = this.productionLineCode; submitItem.productionlineCode = this.productionLineCode;
detail.workStationCode = this.workStationCode; submitItem.workStationCode = this.workStationCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
subList.push(submitItem)
} }
}) })
}) })
@ -428,8 +432,6 @@
showMessage(message) { showMessage(message) {
this.scanPopupLoseFocus(); this.scanPopupLoseFocus();
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {

37
pages/productionReturn/record/returnToStore.vue
View File

@ -50,6 +50,7 @@
import { import {
goHome, goHome,
getPackingNumberAndBatchByList, getPackingNumberAndBatchByList,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -417,34 +418,36 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
var submitItem = deepCopyData(detail)
var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
detail.packingNumber, detail.fromLocationCode, detail.batch); detail.packingNumber, detail.fromLocationCode, detail.batch);
var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode, var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch); detail.packingNumber, detail.toLocationCode, detail.batch);
detail.itemCode = detail.itemCode; submitItem.itemCode = detail.itemCode;
detail.itemName = detail.package.itemName; submitItem.itemName = detail.package.itemName;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemDesc1 = detail.package.itemDesc1;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = fromInfo.packingNumber; submitItem.fromPackingNumber = fromInfo.packingNumber;
detail.toPackingNumber = toInfo.packingNumber; submitItem.toPackingNumber = toInfo.packingNumber;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = fromInfo.batch; submitItem.fromBatch = fromInfo.batch;
detail.toBatch = toInfo.batch; submitItem.toBatch = toInfo.batch;
detail.fromLocationCode = detail.fromLocationCode; submitItem.fromLocationCode = detail.fromLocationCode;
detail.toLocationCode = detail.toLocationCode; submitItem.toLocationCode = detail.toLocationCode;
detail.productionlineCode = this.productionLineCode; submitItem.productionlineCode = this.productionLineCode;
detail.workStationCode = this.workStationCode; submitItem.workStationCode = this.workStationCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
subList.push(submitItem)
} }
}) })
}) })

33
pages/purchaseReturn/record/returnRecord.vue
View File

@ -54,7 +54,8 @@
import { import {
goHome, goHome,
updateTitle, updateTitle,
navigateBack navigateBack,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -273,28 +274,30 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
detail.itemCode = detail.itemCode; var submitItem = deepCopyData(detail)
detail.inventoryStatus = detail.inventoryStatus; submitItem.itemCode = detail.itemCode;
submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = detail.packingNumber; submitItem.fromPackingNumber = detail.packingNumber;
detail.toPackingNumber = detail.packingNumber;; submitItem.toPackingNumber = detail.packingNumber;;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = detail.batch; submitItem.fromBatch = detail.batch;
detail.toBatch = detail.batch; submitItem.toBatch = detail.batch;
detail.fromLocationCode = this.fromLocationCode; submitItem.fromLocationCode = this.fromLocationCode;
detail.toLocationCode = ''; //采购退货直接出库，目标库位为空 submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空
detail.package = null; submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
subList.push(detail) submitItem.package = "";
subList.push(submitItem)
} }
}) })
}) })
this.dataContent.subList = subList this.dataContent.subList = subList
this.dataContent.creator = creator;
// this.dataContent.jobNumber = ''; // this.dataContent.jobNumber = '';
return this.dataContent; return this.dataContent;
}, },

35
pages/transfer/coms/comTransferRecord.vue
View File

@ -51,6 +51,7 @@
import { import {
goHome, goHome,
deepCopyData,
getPackingNumberAndBatchByList getPackingNumberAndBatchByList
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -338,28 +339,32 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
var submitItem = deepCopyData(detail)
var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch); detail.packingNumber, detail.toLocationCode, detail.batch);
detail.itemCode = detail.itemCode; submitItem.itemCode = detail.itemCode;
detail.itemName = detail.package.itemName; submitItem.itemName = detail.package.itemName;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemDesc1 = detail.package.itemDesc1;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = info.packingNumber; submitItem.fromPackingNumber = info.packingNumber;
detail.toPackingNumber = info.packingNumber; submitItem.toPackingNumber = info.packingNumber;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = info.batch; submitItem.fromBatch = info.batch;
detail.toBatch = info.batch; submitItem.toBatch = info.batch;
detail.fromLocationCode = detail.locationCode; submitItem.fromLocationCode = detail.locationCode;
detail.toLocationCode = detail.toLocationCode; submitItem.toLocationCode = detail.toLocationCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
submitItem.package ="";
subList.push(submitItem)
} }
}) })
}) })

37
pages/unPlanned/record/issueRecord.vue
View File

@ -71,7 +71,8 @@
import { import {
goHome, goHome,
updateTitle updateTitle,
deepCopyData
} from '@/common/basic.js'; } from '@/common/basic.js';
export default { export default {
@ -233,27 +234,31 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
detail.itemCode = detail.itemCode; var submitItem = deepCopyData(detail)
detail.itemName = detail.package.itemName; submitItem.itemCode = detail.itemCode;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemName = detail.package.itemName;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc1 = detail.package.itemDesc1;
submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = detail.packingNumber; submitItem.fromPackingNumber = detail.packingNumber;
detail.toPackingNumber = detail.packingNumber; submitItem.toPackingNumber = detail.packingNumber;
detail.fromContainerNumber = detail.containerNumber; submitItem.fromContainerNumber = detail.containerNumber;
detail.toContainerNumber = detail.containerNumber submitItem.toContainerNumber = detail.containerNumber
detail.fromBatch = detail.batch; submitItem.fromBatch = detail.batch;
detail.toBatch = detail.batch; submitItem.toBatch = detail.batch;
detail.fromLocationCode = detail.locationCode; submitItem.fromLocationCode = detail.locationCode;
detail.toLocationCode = ""; submitItem.toLocationCode = "";
detail.reason = this.reasonCode; submitItem.reason = this.reasonCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
submitItem.package ="";
subList.push(submitItem)
} }
}) })
}) })

31
pages/unPlanned/record/receiptRecord.vue
View File

@ -67,6 +67,7 @@
import { import {
goHome, goHome,
updateTitle, updateTitle,
deepCopyData,
getPackingNumberAndBatchByList getPackingNumberAndBatchByList
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -308,31 +309,35 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
var submitItem = deepCopyData(detail)
var info = getPackingNumberAndBatchByList(this.managementList, detail.label.itemCode, var info = getPackingNumberAndBatchByList(this.managementList, detail.label.itemCode,
detail.label.packingNumber, detail.toLocationCode, detail.label.batch); detail.label.packingNumber, detail.toLocationCode, detail.label.batch);
detail.itemCode = detail.package.itemCode; submitItem.itemCode = detail.package.itemCode;
detail.itemName = detail.package.itemName; submitItem.itemName = detail.package.itemName;
detail.itemDesc1 = detail.package.itemDesc1; submitItem.itemDesc1 = detail.package.itemDesc1;
detail.itemDesc2 = detail.package.itemDesc2; submitItem.itemDesc2 = detail.package.itemDesc2;
detail.inventoryStatus = detail.inventoryStatus; submitItem.inventoryStatus = detail.inventoryStatus;
detail.fromPackingNumber = info.packingNumber; submitItem.fromPackingNumber = info.packingNumber;
detail.toPackingNumber = info.packingNumber; submitItem.toPackingNumber = info.packingNumber;
// detail.fromContainerNumber = detail.containerNumber; // detail.fromContainerNumber = detail.containerNumber;
// detail.toContainerNumber = detail.containerNumber // detail.toContainerNumber = detail.containerNumber
detail.fromBatch = info.batch; submitItem.fromBatch = info.batch;
detail.toBatch = info.batch; submitItem.toBatch = info.batch;
detail.fromLocationCode = ""; submitItem.fromLocationCode = "";
detail.toLocationCode = detail.toLocationCode; submitItem.toLocationCode = detail.toLocationCode;
detail.reason = this.reasonCode; submitItem.reason = this.reasonCode;
subList.push(detail) submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
submitItem.package ="";
subList.push(submitItem)
} }
}) })
}) })

Write Preview
Loading…
Cancel
Save