From 111e559e11137ba87db3ff978db933170b7cb158 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 05 七月 2025 15:58:06 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java | 36 +++++----
zy-asrs-admin/src/views/base/zpalletBarcode/index.vue | 42 +++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java | 15 ++-
zy-asrs-admin/src/components/order/order/orderOut.vue | 74 ++++++++++++------
zy-asrs-admin/src/utils/request.js | 8 ++
zy-asrs-admin/src/views/loc/locDetl/index.vue | 44 ++++++++++-
zy-asrs-admin/src/components/order/order/order.vue | 20 +++-
7 files changed, 180 insertions(+), 59 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/order.vue b/zy-asrs-admin/src/components/order/order/order.vue
index b5f3a32..8b26812 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -25,6 +25,7 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const orderType = ref(null)
const editChild = ref(null)
const showOrderDetlChild = ref(null)
@@ -158,10 +159,11 @@
current: currentPage,
pageSize: pageSize,
condition: searchInput.value,
+ orderType: orderType.value,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
- console.log('--------->')
+ console.log('--------->')
let data = result.data;
tableData.value = data;
@@ -290,8 +292,13 @@
<EditView ref="editChild" @tableReload="handleTableReload"
:ioModel="ioModel == 'in' ? 1 : ioModel == 'out' ? 2 : null" />
<div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ <div style="margin-left : 10px;">
+ <a-select v-model:value="orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')" :options="[
+ { label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 }, ]" style="width: 160px;margin-right: 10px;">
+ </a-select>
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ </div>
<div class="table-header-right">
<a-dropdown>
<template #overlay>
@@ -324,15 +331,16 @@
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
:data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:pagination="{ total: tableData.total, onChange: onPageChange }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"
+ :loading="state.loading">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
<a-button type="link" primary @click="showDetl(record)">{{ formatMessage('page.order.orderDetl', '璁㈠崟鏄庣粏')
- }}</a-button>
+ }}</a-button>
<a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
+ }}</a-button>
</div>
</template>
</template>
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 85a6da8..8ee1a03 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -1,5 +1,5 @@
<script setup>
-import {getCurrentInstance, ref, computed, reactive, defineProps, nextTick} from 'vue';
+import { getCurrentInstance, ref, computed, reactive, defineProps, nextTick } from 'vue';
import { useRouter } from "vue-router";
import { get, post, postBlob, postForm } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
@@ -77,6 +77,27 @@
width: 140,
ellipsis: true,
...getColumnSearchProps('orderSettle$'),
+ },
+ {
+ title: formatMessage('db.man_order.order_settle', '瀹㈡埛鍚嶇О'),
+ dataIndex: 'customer',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('customer'),
+ },
+ {
+ title: formatMessage('db.man_order.order_settle', '鐢佃瘽'),
+ dataIndex: 'phone',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('phone'),
+ },
+ {
+ title: formatMessage('db.man_order.order_settle', '鍦板潃'),
+ dataIndex: 'address',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('address'),
},
{
title: formatMessage('db.man_order.ioPri', '浼樺厛绾�'),
@@ -241,21 +262,21 @@
const printChild = ref(null);
// 鎵撳嵃璁㈠崟
const handlePrint = async (record) => {
- let printData = [];
- const resp = await get("/api/orderDetl/orderId/" + record.__v_raw.id, {});
- const result = resp.data;
- result.data.forEach((item) => {
- let newItem = {};
- newItem.matnr = item.mat$.matnr
- newItem.maktx = item.mat$.maktx
- newItem.specs = item.mat$.specs
- newItem.batch = item.batch
- newItem.anfme = item.anfme
- printData.push(newItem)
- })
- printChild.value.printData = printData;
- printChild.value.orderNo = record.__v_raw.orderNo
- printChild.value.open = true;
+ let printData = [];
+ const resp = await get("/api/orderDetl/orderId/" + record.__v_raw.id, {});
+ const result = resp.data;
+ result.data.forEach((item) => {
+ let newItem = {};
+ newItem.matnr = item.mat$.matnr
+ newItem.maktx = item.mat$.maktx
+ newItem.specs = item.mat$.specs
+ newItem.batch = item.batch
+ newItem.anfme = item.anfme
+ printData.push(newItem)
+ })
+ printChild.value.printData = printData;
+ printChild.value.orderNo = record.__v_raw.orderNo
+ printChild.value.open = true;
}
const onSearch = () => {
@@ -417,7 +438,7 @@
<a-select v-model:value="channel" :options="channelList" mode="multiple"
style="width: 100px;"></a-select>
<a-button @click="handleGenerateWave()">{{ formatMessage('common.generateWave', '鐢熸垚娉㈡')
- }}</a-button>
+ }}</a-button>
</div>
</div>
@@ -458,23 +479,24 @@
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
- <a-button type="link" primary @click="showDetl(record)">{{ formatMessage('page.order.orderDetl',
- '璁㈠崟鏄庣粏')
- }}</a-button>
- <a-button type="link" primary @click="handlePrint(record)">{{ formatMessage('page.order.orderDetl',
- '鎵撳嵃璁㈠崟')
- }}</a-button>
+ <a-button type="link" primary @click="showDetl(record)">{{ formatMessage('page.order.orderDetl',
+ '璁㈠崟鏄庣粏')
+ }}</a-button>
+ <a-button type="link" primary @click="handlePrint(record)">{{
+ formatMessage('page.order.orderDetl',
+ '鎵撳嵃璁㈠崟')
+ }}</a-button>
<a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫')
- }}</a-button>
+ }}</a-button>
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
+ }}</a-button>
</div>
</template>
</template>
</a-table>
<ShowOrderDetlComponent ref="showOrderDetlChild" />
</div>
- <OrderPrint ref="printChild" />
+ <OrderPrint ref="printChild" />
</template>
<style></style>
diff --git a/zy-asrs-admin/src/utils/request.js b/zy-asrs-admin/src/utils/request.js
index 1ec9dc9..54d11b0 100644
--- a/zy-asrs-admin/src/utils/request.js
+++ b/zy-asrs-admin/src/utils/request.js
@@ -7,6 +7,10 @@
})
export const get = async (url, params) => {
+ if (params?.condition != null || params?.condition != undefined) {
+ params.current = 1
+ }
+
return instance({
url: url,
method: 'get',
@@ -18,6 +22,10 @@
}
export const post = async (url, data) => {
+ if (data?.condition != null || data?.condition != undefined) {
+ data.current = 1
+ }
+
return instance({
url: url,
method: 'post',
diff --git a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
index 1f6c2b5..39bf8bd 100644
--- a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
+++ b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
@@ -228,6 +228,39 @@
})
}
+const handleDelete = () => {
+ if (state.selectedRowKeys.length == 0) {
+ message.warning(formatMessage('common.select', '璇烽�夋嫨'));
+ return;
+ }
+
+ Modal.confirm({
+ title: formatMessage('page.delete', '鍒犻櫎'),
+ content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/zpalletBarcode/remove/' + state.selectedRowKeys).then(resp => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ } else {
+ message.error(result.msg);
+ }
+ getPage()
+ hide()
+ })
+ } catch (error) {
+ message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+ }
+ },
+ });
+
+ console.log(state.selectedRowKeys);
+
+}
+
const handlePrint = () => {
if (state.selectedRowKeys.length == 0) {
message.warning(formatMessage('common.select', '璇烽�夋嫨'));
@@ -259,9 +292,12 @@
<div class="table-header">
<div>
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ style="width: 200px; margin: 0 10px;" @search="onSearch" />
<a-button @click="handlePrint()" type="primary">
{{ formatMessage('db.man_zpallet_barcode.batchPrint', '鎵归噺鎵撳嵃') }}
+ </a-button>
+ <a-button @click="handleDelete()" danger style="margin: 0 10px;">
+ {{ formatMessage('db.man_zpallet_barcode.batchPrint', '鎵归噺鍒犻櫎') }}
</a-button>
</div>
<div class="table-header-right">
@@ -296,10 +332,10 @@
<a-form-item :label="formatMessage('db.man_zpallet_barcode.generateNum', '鐢熸垚鏁伴噺')">
<a-input v-model:value="generateNum" />
</a-form-item>
- <a-form-item :label="formatMessage('db.man_container.type', '鎵樼洏绫诲瀷')" name="type" >
+ <a-form-item :label="formatMessage('db.man_container.type', '鎵樼洏绫诲瀷')" name="type">
<a-select v-model:value="pakinType" :options="[
{ label: '骞冲簱鎵樼洏', value: 1 },
- { label: '绔嬪簱鎵樼洏', value: 2 },
+ { label: '绔嬪簱鎵樼洏', value: 2 },
]">
</a-select>
</a-form-item>
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 3bd47b6..3cd21c5 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -70,6 +70,13 @@
...getColumnSearchProps('locNo'),
},
{
+ title: formatMessage('db.man_loc_detl.loc_type', '搴撲綅绫诲瀷'),
+ dataIndex: 'type$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('type$'),
+ },
+ {
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
@@ -96,6 +103,34 @@
width: 140,
ellipsis: true,
...getColumnSearchProps('model'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.matnr', '鍝佺被'),
+ dataIndex: 'tagId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('tagId$'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.maktx', '棰滆壊'),
+ dataIndex: 'color',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('color'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.model', '鍝佺墝'),
+ dataIndex: 'brand',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('brand'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.model', '浜у湴'),
+ dataIndex: 'origin',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('origin'),
},
{
title: formatMessage('db.man_loc_detl.dewell', '鍏ュ簱鏃堕棿'),
@@ -226,8 +261,8 @@
let content = "鏄惁纭鐢熸垚-->鍑哄簱浠诲姟锛侊紒"
let type = 2
if (item?.locNo.indexOf("B") >= 0 || item?.locNo.indexOf("C") >= 0) {
- content = "鏄惁纭鐢熸垚-->鎷ｈ揣鍗曪紒锛�"
- type = 1
+ content = "鏄惁纭鐢熸垚-->鎷ｈ揣鍗曪紒锛�"
+ type = 1
}
Modal.confirm({
title: formatMessage('page.delete', '鍑哄簱'),
@@ -246,7 +281,7 @@
console.log(result);
message.success(result.msg);
} else {
- message.error(result.msg);
+ message.error(result.msg);
}
getPage()
hide()
@@ -361,7 +396,8 @@
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
- <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '鎵嬪姩鍑哄簱') }}</a-button>
+ <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '鎵嬪姩鍑哄簱')
+ }}</a-button>
<!-- <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')}}</a-button> -->
</div>
</template>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java
index 9f8d543..5838111 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java
@@ -120,16 +120,18 @@
pakinType = "ctu";
}
}
- ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>().eq(ZpalletBarcode::getBarcode, barcode));
- if (one != null) {
- return R.error("鏉＄爜璧峰鍊煎凡瀛樺湪");
- }
+
if (pakinType.equals("flat")) {
int barcodeInt = Integer.parseInt(String.valueOf(barcode));
for (int i = 0; i < Integer.parseInt(String.valueOf(num)); i++) {
ZpalletBarcode zpalletBarcode = new ZpalletBarcode();
String strBarcode = String.format("%08d", barcodeInt);
zpalletBarcode.setBarcode("PK" + strBarcode);
+ ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>()
+ .eq(ZpalletBarcode::getBarcode, strBarcode));
+ if (one != null) {
+ continue;
+ }
zpalletBarcodeService.save(zpalletBarcode);
barcodeInt += 1;
}
@@ -139,6 +141,11 @@
ZpalletBarcode zpalletBarcode = new ZpalletBarcode();
String strBarcode = String.format("%08d", barcodeInt);
zpalletBarcode.setBarcode(strBarcode);
+ ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>()
+ .eq(ZpalletBarcode::getBarcode, strBarcode));
+ if (one != null) {
+ continue;
+ }
zpalletBarcodeService.save(zpalletBarcode);
barcodeInt += 1;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
index 8dbe600..d468ece 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
@@ -95,6 +95,15 @@
@ApiModelProperty("鍨嬪彿")
private String model;
+ @ApiModelProperty("鍝佺墝")
+ private String brand;
+
+ @ApiModelProperty("棰滆壊")
+ private String color;
+
+ @ApiModelProperty("浜у湴")
+ private String origin;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@@ -197,27 +206,22 @@
// return null;
// }
-// public String getTagId$() {
-// TagService tagService = SpringUtils.getBean(TagService.class);
-// Tag byId = tagService.getById(this.tagId);
-// if (!Cools.isEmpty(byId)){
-// return byId.getName();
-// }
-// return null;
-// }
+ public String getTagId$() {
+ TagService tagService = SpringUtils.getBean(TagService.class);
+ Tag byId = tagService.getById(this.tagId);
+ if (!Cools.isEmpty(byId)){
+ return byId.getName();
+ }
+ return null;
+ }
-
-// @Delegate(types = Mat.class)
-// public Mat getMatId$(){
-// MatService service = SpringUtils.getBean(MatService.class);
-// Mat mat = service.getById(this.matId);
-// return mat;
-// }
+ public String getType$() {
+ return (this.locNo.contains("B") || this.locNo.contains("C")) ? "骞冲簱" : "绔嬪簱";
+ }
public String getDewell$() {
return DateUtils.diff(new Date(), createTime) + "澶�";
}
-
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
--
Gitblit v1.9.1