+
-
-
+
+
@@ -167,7 +167,7 @@ async function save() {
if (!trim(dialog.unit)) return ElMessage.warning('单位为必填项')
if (!dialog.id && !trim(dialog.code)) return ElMessage.warning('图号为必填项(创建后不可改)')
if (![1, 2, 3].includes(dialog.manageMode)) return ElMessage.warning('请选择类型')
- if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择序列号件(序列号件/批次件)')
+ if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择是否有序列号(是=序列号件 / 否=批次件)')
const body = {
name: trim(dialog.name), spec: trim(dialog.spec), unit: trim(dialog.unit), description: dialog.description,
manageMode: dialog.manageMode, snMode: dialog.snMode, isActive: dialog.isActive
diff --git a/bj_power_mes/frontend/src/pages/Station.vue b/bj_power_mes/frontend/src/pages/Station.vue
index 803d21d..ac34a65 100644
--- a/bj_power_mes/frontend/src/pages/Station.vue
+++ b/bj_power_mes/frontend/src/pages/Station.vue
@@ -120,9 +120,11 @@ const flows = ref([])
const dockByStation = ref({})
async function loadDocks() {
- const data = await request.get('/docks', { params: { page: 1, size: 200 } })
+ // GET /docks 返回裸数组(接驳台全量,非分页包裹),直接取数组本身
+ const data = await request.get('/docks')
+ const list = Array.isArray(data) ? data : (data?.list || [])
const map = {}
- for (const d of data?.list || []) {
+ for (const d of list) {
const no = Number(d.stationNo) || 0
if (no <= 0) continue
;(map[no] = map[no] || []).push(d.dockCode)
diff --git a/bj_power_mes/public/index.html b/bj_power_mes/public/index.html
index c13895f..cbae33f 100644
--- a/bj_power_mes/public/index.html
+++ b/bj_power_mes/public/index.html
@@ -6,7 +6,7 @@
MES 产线控制
-
+
diff --git a/bj_power_wms/frontend/src/components/InboundEntry.vue b/bj_power_wms/frontend/src/components/InboundEntry.vue
index 72b4f69..fd0de49 100644
--- a/bj_power_wms/frontend/src/components/InboundEntry.vue
+++ b/bj_power_wms/frontend/src/components/InboundEntry.vue
@@ -248,7 +248,7 @@ onMounted(() => loadZones())
- 记账方式:{{ isSn ? '序列号件(是)' : '批次件(否)' }}
+ 序列号:{{ isSn ? '是' : '否' }}