diff --git a/src/api/Inventory/autoInventory.js b/src/api/Inventory/autoInventory.js index add3b65..8ff474d 100644 --- a/src/api/Inventory/autoInventory.js +++ b/src/api/Inventory/autoInventory.js @@ -17,7 +17,14 @@ export function getScan(query) { params: query }) } - +// 统计 +export function getTotalStatistics(data) { + return request({ + url: '/MatchScan/statistics', + method: 'post', + data: data + }) +} // 开始匹配 export function getMatch(data) { return request({ @@ -44,6 +51,15 @@ export function getScanResult(query) { params: query }) } +// 获取盘点结果 - 最新再用 +export function inventoryList(data) { + return request({ + url: '/MatchScan/inventoryList', + method: 'post', + data: data + }) +} + // 获取图表 export function getChart(data) { diff --git a/src/components/printBill/bill.vue b/src/components/printBill/bill.vue index 65ae0f4..32c0e84 100644 --- a/src/components/printBill/bill.vue +++ b/src/components/printBill/bill.vue @@ -73,6 +73,7 @@ + @@ -87,7 +88,8 @@ - + + @@ -151,7 +153,7 @@ const summaryList = computed(() => { props.billAllObj.forEach(item => { if (map.has(item.wlNo)) { const existing = map.get(item.wlNo); - const total = (parseFloat(existing.totalQty) + parseFloat(item.realQty)) * 100*10000 + const total = (parseFloat(existing.totalQty)*100 *10000 + parseFloat(item.realQty)*100 *10000) existing.totalQty = total / ( 100 * 10000); } else { map.set(item.wlNo, { diff --git a/src/components/storageBill/bill.vue b/src/components/storageBill/bill.vue index 059c2e7..9f55c92 100644 --- a/src/components/storageBill/bill.vue +++ b/src/components/storageBill/bill.vue @@ -145,7 +145,7 @@ const summaryList = computed(() => { props.billAllObj.forEach(item => { if (map.has(item.wlNo)) { const existing = map.get(item.wlNo); - const total = (parseFloat(existing.totalQty) + parseFloat(item.realQty)) * 100*10000 + const total = (parseFloat(existing.totalQty) * 100*10000+ parseFloat(item.realQty)* 100*10000) existing.totalQty = total / ( 100 * 10000); } else { map.set(item.wlNo, { diff --git a/src/views/Inventory/task/autoInventory.vue b/src/views/Inventory/task/autoInventory.vue index dae3012..4285120 100644 --- a/src/views/Inventory/task/autoInventory.vue +++ b/src/views/Inventory/task/autoInventory.vue @@ -69,14 +69,47 @@ 当前为未扫描到，但数据库里有的数据当前为已扫描到，但数据库里没有的数据 - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,7 +139,7 @@ @@ -115,7 +148,7 @@ - + diff --git a/src/views/wisdom/bill/index.vue b/src/views/wisdom/bill/index.vue index 7315709..ce4b112 100644 --- a/src/views/wisdom/bill/index.vue +++ b/src/views/wisdom/bill/index.vue @@ -307,10 +307,24 @@ 添加 - +
+
+ + 添加至入库 +
+
[已添加{{ outTempData.length }}条库存]
+ +
+
+ + 删除 +
+ + - + - - + + @@ -71,7 +71,7 @@ + @change="changeOperationType($event, 'operationTypeCK')" clearable > @@ -183,7 +183,7 @@ const data = reactive({ pageNum: 1, pageSize: 10, billNo: null, - isChuku: null, + bizType: null, startTime: null, endTime: null, xmNo: null, @@ -276,13 +276,15 @@ function handleExport() { //搜索按钮操作 function handleQuery() { //所属仓库 - console.log(warehouseCode.value, optionTime, '===='); + console.log(operationTypeCK.value,operationTypeRK.value, '===='); if (warehouseCode.value) { queryParams.value.cangku = warehouseCode.value[1] } //详细类型 if (operationTypeCK.value?.length > 0 || operationTypeRK.value?.length > 0) { queryParams.value.operationType = operationTypeRK.value || operationTypeCK.value + }else{ + queryParams.value.operationType ='' } //操作时间 if (optionTime.value && optionTime.value.length > 0) { diff --git a/src/views/wisdom/stock/index.vue b/src/views/wisdom/stock/index.vue index 49514ab..b6fb0cb 100644 --- a/src/views/wisdom/stock/index.vue +++ b/src/views/wisdom/stock/index.vue @@ -60,24 +60,34 @@ :props="{ children: 'children', label: 'warehouseName', value: 'warehouseCode' }" clearable /> + + + + + + + - + - - - + + + + + + 搜索 @@ -85,6 +95,7 @@ + @@ -109,6 +120,7 @@ ref="infoTableRef" highlight-current-row @row-click="(row) => tableInfoRowClick(row, infoTableRef)" + @selection-change="printSelectionChange" border> @@ -128,6 +140,7 @@ + @@ -328,6 +341,7 @@ import { listStock, getTotal, editStock, printTag } from "@/api/wisdom/ import { warehousingDict } from "@/api/information/warehousingtype"; //入库类型 import { materialtypeDict } from "@/api/information/materialtype"; //物资类型 import { warehouseAll } from "@/api/information/warehouseinfo"; //所属仓库 +import { listScene } from "@/api/information/scene"; //所属仓库 import { personListDict } from "@/api/system/user"; //理货员 import { getKwAllList } from "@/api/information/pcdedetail"; //库位下拉数据 import { parseTime } from '@/utils/manage' @@ -342,7 +356,7 @@ const showSearch = ref(true); const warehouseCode = ref(''); //所属仓库下拉数据 -const printList = ref([]) //要打印的数据列表 + const optionTime = ref([]) //入库时间 @@ -377,6 +391,7 @@ const data = reactive({ cangku: "", wlMs: "", ids: [], + remark: "", }, rules: { wlType: [{ required: true, message: "物资类型不能为空", trigger: "change" }], @@ -410,6 +425,11 @@ function getList() { } getList(); +const printList = ref([]) //要打印的数据列表 +const printSelectionChange = (selection) => { + printList.value = selection +} + // 获取总计 const totalMoney = ref(null) const pcodeCount = ref(null) @@ -444,6 +464,14 @@ function materialFun() { }) } materialFun() +//场景下拉 +const sceneTypeList = ref([]); +function listSceneFun() { + listScene().then(response => { + sceneTypeList.value = response.rows + }) +} +listSceneFun() //理货员 const personList = ref([]); @@ -554,12 +582,12 @@ function submitMoveForm() { proxy.$modal.msgError("仓库不能为空"); return; } - if (checkStockList.value[0].pcode == checkStockList.value[0].toPcode) { - proxy.$modal.msgError( - "不允许选择原来的库位【" + checkStockList.value[0].pcode + "】" - ); - return; - } + // if (checkStockList.value[0].pcode == checkStockList.value[0].toPcode) { + // proxy.$modal.msgError( + // "不允许选择原来的库位【" + checkStockList.value[0].pcode + "】" + // ); + // return; + // } if (checkStockList.value[0].realQty > checkStockList.value[0].num) { proxy.$modal.msgError("移库数量不正确"); return;
序号 物料号 物料描述 计量单位
{{ index + 1 }} {{ item.wlNo }} {{ item.wlMs }} {{ item.dw }}