From d4b5d47dfc4861a55219b3bc2c6fa77742b77736 Mon Sep 17 00:00:00 2001 From: zx Date: Thu, 12 Feb 2026 11:16:06 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/printBill/bill.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/printBill/bill.vue b/src/components/printBill/bill.vue index 65ae0f4..d0cc721 100644 --- a/src/components/printBill/bill.vue +++ b/src/components/printBill/bill.vue @@ -73,6 +73,7 @@ + @@ -87,7 +88,8 @@ - + + From e2d502394c15a444e3f72a391a14daed5c78abae Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Thu, 12 Feb 2026 15:22:50 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/bill/index.vue | 87 +++++++++++++++++++++++++++++++- src/views/wisdom/stock/index.vue | 8 ++- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/src/views/wisdom/bill/index.vue b/src/views/wisdom/bill/index.vue index f04b33c..5861495 100644 --- a/src/views/wisdom/bill/index.vue +++ b/src/views/wisdom/bill/index.vue @@ -307,6 +307,20 @@ 添加 +
+
+
+ + 添加至入库 +
+
[已添加{{ outTempData.length }}条库存]
+ +
+
+ + 删除 +
+
@@ -666,7 +680,7 @@ const printNumList = ref([ { id: 3, statusName: "3" }, { id: 4, statusName: "4" }, ]); -const printNum = ref(0); //打印机编号 +const printNum = ref(1); //打印机编号 const moveReason = ref(""); //移库原因 const operationTime = ref([]); const actionUrl = @@ -860,6 +874,7 @@ function handleAdd(single) { isSingle.value = single; reset(); open.value = true; + outTempData.value = [] title.value = "添加库存单据"; } @@ -880,6 +895,56 @@ const statusList = ref([ { value: 2, label: "部分入库" }, ]); const checkPlanList = ref([]); //已选中的要入库的数据 + +// 点击添加至出库 +const outTempData = ref([]); +function addData() { + if (checkPlanList.value.length == 0) { + proxy.$modal.msgError("请勾选数据"); + return; + } + let data = outTempData.value.concat(checkPlanList.value); + let arr = [] + let spaNoTotal = '' + const idList = []; // 用于统计每个id出现的次数 + // 第一步：遍历数组，统计id出现次数 + data.forEach(item => { + if (idList.includes(item.id)) { + spaNoTotal += item.sapNo + ',' + } else { + arr.push(item) + idList.push(item.id); + } + }); + if (spaNoTotal) { + proxy.$modal.msgError("存在重复数据：" + spaNoTotal); + } + outTempData.value = arr +} + +// 查看所有的出库数据 +const viewData = () => { + planList.value = JSON.parse(JSON.stringify(outTempData.value)); +} + +// 删除选中的出库数据 +const deleteData = () => { + if (checkPlanList.value.length == 0) { + proxy.$modal.msgError("请勾选数据"); + return; + } + proxy.$modal.confirm("确认删除选中的出库数据吗？").then(() => { + const ids = checkPlanList.value.map(item => item.id); + console.log(ids) + planList.value = planList.value.filter(item => { + // 无id的元素默认保留（如果想删除无id的，可改为 item?.id && !arr2Ids.has(item.id)） + return !ids.includes(item?.id); + }); + outTempData.value = planList.value + }); +} + + //新增入库 多选框选中数据 function handleSelectionChange(selection) { checkPlanList.value = selection; @@ -972,6 +1037,10 @@ function addNum(row) { /** 确定入库按钮 */ function submitForm() { + if (outTempData.value.length !== planList.value.length) { + proxy.$modal.msgError("请查看勾选数据"); + return; + } proxy.$refs["stockRef"].validate((valid) => { if (valid) { if (checkPlanList.value.length == 0) { @@ -1790,4 +1859,20 @@ isAudit(); display: flex; justify-content: flex-end; } + + +.addBox{ + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + cursor: pointer; + .addData { + display: flex; + align-items: center; + color: var(--el-text-color-regular); + font-weight: bold; + } + +} diff --git a/src/views/wisdom/stock/index.vue b/src/views/wisdom/stock/index.vue index 49514ab..ae24fbb 100644 --- a/src/views/wisdom/stock/index.vue +++ b/src/views/wisdom/stock/index.vue @@ -65,11 +65,16 @@ - + + + + + + @@ -377,6 +382,7 @@ const data = reactive({ cangku: "", wlMs: "", ids: [], + remark: "", }, rules: { wlType: [{ required: true, message: "物资类型不能为空", trigger: "change" }], From 43791e8ab64e059ea40c721f1fd9c1372c454f6a Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Fri, 13 Feb 2026 08:17:01 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=93=E5=8D=B0=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/stock/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/wisdom/stock/index.vue b/src/views/wisdom/stock/index.vue index ae24fbb..42c698c 100644 --- a/src/views/wisdom/stock/index.vue +++ b/src/views/wisdom/stock/index.vue @@ -114,6 +114,7 @@ ref="infoTableRef" highlight-current-row @row-click="(row) => tableInfoRowClick(row, infoTableRef)" + @selection-change="printSelectionChange" border> @@ -347,7 +348,7 @@ const showSearch = ref(true); const warehouseCode = ref(''); //所属仓库下拉数据 -const printList = ref([]) //要打印的数据列表 + const optionTime = ref([]) //入库时间 @@ -416,6 +417,11 @@ function getList() { } getList(); +const printList = ref([]) //要打印的数据列表 +const printSelectionChange = (selection) => { + printList.value = selection +} + // 获取总计 const totalMoney = ref(null) const pcodeCount = ref(null) From e400907db9b7178345b3cb59866b03161fb0ab59 Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Fri, 13 Feb 2026 09:43:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/outbound/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wisdom/outbound/index.vue b/src/views/wisdom/outbound/index.vue index 58171e0..adb5630 100644 --- a/src/views/wisdom/outbound/index.vue +++ b/src/views/wisdom/outbound/index.vue @@ -113,8 +113,9 @@ >否 是 - 配送中 - 配送完成 + 待配送 + 配送中 + 配送完成 Date: Fri, 13 Feb 2026 10:11:19 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/stock/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wisdom/stock/index.vue b/src/views/wisdom/stock/index.vue index 42c698c..33f3605 100644 --- a/src/views/wisdom/stock/index.vue +++ b/src/views/wisdom/stock/index.vue @@ -566,12 +566,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; From 30f82750a5e94ada819239db384e5b5ae2e873d3 Mon Sep 17 00:00:00 2001 From: zx Date: Fri, 13 Feb 2026 10:21:04 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/record/index.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/wisdom/record/index.vue b/src/views/wisdom/record/index.vue index dfa0324..a09ad56 100644 --- a/src/views/wisdom/record/index.vue +++ b/src/views/wisdom/record/index.vue @@ -18,8 +18,8 @@ - - + + @@ -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) { From 8e818b7430b407735d92cd7c4263d261f815defc Mon Sep 17 00:00:00 2001 From: zx Date: Tue, 24 Feb 2026 15:23:09 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=80=BB=E8=AE=A1=E6=B1=82=E5=92=8C=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/printBill/bill.vue | 2 +- src/components/storageBill/bill.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/printBill/bill.vue b/src/components/printBill/bill.vue index d0cc721..32c0e84 100644 --- a/src/components/printBill/bill.vue +++ b/src/components/printBill/bill.vue @@ -153,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, { From 2897bc3f51fb1d7deeacdcd9ccaf062cf167825e Mon Sep 17 00:00:00 2001 From: zx Date: Wed, 25 Feb 2026 16:15:47 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/stock/index.vue | 34 +++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/views/wisdom/stock/index.vue b/src/views/wisdom/stock/index.vue index 33f3605..b6fb0cb 100644 --- a/src/views/wisdom/stock/index.vue +++ b/src/views/wisdom/stock/index.vue @@ -60,29 +60,34 @@ :props="{ children: 'children', label: 'warehouseName', value: 'warehouseCode' }" clearable /> + + + + + + + - + - - - - - - - - + + + + + + 搜索 @@ -90,6 +95,7 @@ + @@ -134,6 +140,7 @@ + @@ -334,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' @@ -456,6 +464,14 @@ function materialFun() { }) } materialFun() +//场景下拉 +const sceneTypeList = ref([]); +function listSceneFun() { + listScene().then(response => { + sceneTypeList.value = response.rows + }) +} +listSceneFun() //理货员 const personList = ref([]); From 079818aa0fccf5476f43fe417711228515d714d2 Mon Sep 17 00:00:00 2001 From: zx Date: Sat, 28 Feb 2026 09:35:39 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=9A=84=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Inventory/autoInventory.js | 18 ++- src/views/Inventory/task/autoInventory.vue | 97 +++++++++++++++-- src/views/Inventory/task/index.vue | 4 +- src/views/Inventory/task/inventoryResult.vue | 109 ++++++++++++++++--- 4 files changed, 195 insertions(+), 33 deletions(-) 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/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 @@ - + From 7b77ab0996fbded07bb9b20edc89ac12fddef67d Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Tue, 3 Mar 2026 15:19:02 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=87=B3=E5=85=A5=E5=BA=93=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/bill/index.vue | 61 +++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/src/views/wisdom/bill/index.vue b/src/views/wisdom/bill/index.vue index 5861495..d4364fd 100644 --- a/src/views/wisdom/bill/index.vue +++ b/src/views/wisdom/bill/index.vue @@ -321,10 +321,10 @@ 删除 - - +
序号 物料号 物料描述 计量单位
{{ index + 1 }} {{ item.wlNo }} {{ item.wlMs }} {{ item.dw }}