diff --git a/.env.development b/.env.development index 8e208ac4..ad12ecf2 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -#VITE_BASE_URL=http://192.168.1.196:12080/admin-api +#VITE_BASE_URL=http://192.168.1.49:12080/admin-api VITE_BASE_URL=http://localhost:12080/admin-api #VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api # VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 26599dec..b03cc8bd 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -330,7 +330,7 @@ }, setDataBatch(result, managementPrecision) { - console.log(877, result.balance.qty) + console.log(877, result) try { var packingNumber = result.label.packingNumber; var batch = result.label.batch; @@ -343,11 +343,11 @@ var itemDetail = '' if (managementPrecision == 'BY_QUANTITY') { itemDetail = detail.subList.find(r => { - return r.itemCode == result.label.itemCode + return result.fromLocationCode == r.fromLocationCode }) } else { itemDetail = detail.subList.find(r => { - return r.batch == batch + return r.batch == batch && result.fromLocationCode == r.fromLocationCode }) }