From 4a2b38544137fcfb164ee247ef080897d497e854 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 29 七月 2024 16:09:08 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/orderDetl/edit.vue | 18 +++++++++
zy-asrs-admin/src/components/orderDetl/show.vue | 79 +++++++++++++++++++++++++--------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 10 ++++-
3 files changed, 77 insertions(+), 30 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderDetl/edit.vue b/zy-asrs-admin/src/components/orderDetl/edit.vue
index 3e458f4..5439b8a 100644
--- a/zy-asrs-admin/src/components/orderDetl/edit.vue
+++ b/zy-asrs-admin/src/components/orderDetl/edit.vue
@@ -61,6 +61,20 @@
editable: true,
},
{
+ title: formatMessage('db.man_loc_detl.qty', '宸插畬鎴愭暟閲�'),
+ dataIndex: 'qty',
+ width: 140,
+ ellipsis: true,
+ editable: true,
+ },
+ {
+ title: formatMessage('db.man_loc_detl.workQty', '浣滀笟涓暟閲�'),
+ dataIndex: 'workQty',
+ width: 140,
+ ellipsis: true,
+ editable: true,
+ },
+ {
title: formatMessage('db.man_loc_detl.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
@@ -128,6 +142,8 @@
maktx: item.data.maktx,
batch: '',
anfme: 0,
+ qty: 0,
+ workQty: 0,
memo: ''
};
fieldList.forEach((field) => {
@@ -234,6 +250,8 @@
maktx: item.mat$.maktx,
batch: item.batch,
anfme: item.anfme,
+ qty: item.qty,
+ workQty: item.workQty,
memo: item.memo
};
fieldList.forEach((field) => {
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index 16ebaa1..d517c0a 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -66,6 +66,20 @@
editable: true,
},
{
+ title: formatMessage('db.man_loc_detl.qty', '宸插畬鎴愭暟閲�'),
+ dataIndex: 'qty',
+ width: 140,
+ ellipsis: true,
+ editable: true,
+ },
+ {
+ title: formatMessage('db.man_loc_detl.workQty', '浣滀笟涓暟閲�'),
+ dataIndex: 'workQty',
+ width: 140,
+ ellipsis: true,
+ editable: true,
+ },
+ {
title: formatMessage('db.man_loc_detl.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
@@ -119,33 +133,42 @@
openDetl.value = false;
}
-watch(orderId, (newVal, oldVal) => {
- get("/api/orderDetl/orderId/" + newVal, {}).then((resp) => {
- let result = resp.data;
- let index = 1;
- let tmp = [];
- result.data.forEach((item) => {
- let data = {
- _id: index++,
- detlId: item.id,
- matnr: item.mat$.matnr,
- maktx: item.mat$.maktx,
- batch: item.batch,
- anfme: item.anfme,
- memo: item.memo
- };
- fieldList.forEach((field) => {
- data[field] = item[field];
- })
- tmp.push(data)
- })
- tableData.value = tmp;
- })
+const handleCancel = () => {
+ openDetl.value = false;
+ orderId.value = null;
+}
- get("/api/order/" + newVal, {}).then((resp) => {
- let result = resp.data;
- orderInfo.value = result.data;
- })
+watch(orderId, (newVal, oldVal) => {
+ if (newVal != null) {
+ get("/api/orderDetl/orderId/" + newVal, {}).then((resp) => {
+ let result = resp.data;
+ let index = 1;
+ let tmp = [];
+ result.data.forEach((item) => {
+ let data = {
+ _id: index++,
+ detlId: item.id,
+ matnr: item.mat$.matnr,
+ maktx: item.mat$.maktx,
+ batch: item.batch,
+ anfme: item.anfme,
+ qty: item.qty,
+ workQty: item.workQty,
+ memo: item.memo
+ };
+ fieldList.forEach((field) => {
+ data[field] = item[field];
+ })
+ tmp.push(data)
+ })
+ tableData.value = tmp;
+ })
+
+ get("/api/order/" + newVal, {}).then((resp) => {
+ let result = resp.data;
+ orderInfo.value = result.data;
+ })
+ }
})
defineExpose({
@@ -164,7 +187,7 @@
<template>
<div>
- <a-modal v-model:open="openDetl" width="60%" @ok="handleOk">
+ <a-modal v-model:open="openDetl" width="60%" @ok="handleOk" @cancel="handleCancel">
<div class="component-header">
<div>
<h3>
@@ -193,7 +216,7 @@
display: flex;
}
-.component-header > div {
+.component-header>div {
flex: 1;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index 84f3d59..4839986 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -50,6 +50,8 @@
double anfme = Double.parseDouble(map.get("anfme").toString());
String batch = map.get("batch").toString();
String matnr = map.get("matnr").toString();
+ Double qty = Double.parseDouble(map.get("qty").toString());
+ Double workQty = Double.parseDouble(map.get("workQty").toString());
String memo = map.getOrDefault("memo", "").toString();
Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
if (mat == null) {
@@ -60,8 +62,8 @@
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setAnfme(anfme);
- orderDetl.setQty(0D);
- orderDetl.setWorkQty(0D);
+ orderDetl.setQty(qty);
+ orderDetl.setWorkQty(workQty);
orderDetl.setBatch(batch);
orderDetl.setMatId(mat.getId());
orderDetl.setMemo(memo);
@@ -110,6 +112,8 @@
double anfme = Double.parseDouble(map.get("anfme").toString());
String batch = map.get("batch").toString();
String matnr = map.get("matnr").toString();
+ Double qty = Double.parseDouble(map.get("qty").toString());
+ Double workQty = Double.parseDouble(map.get("workQty").toString());
String memo = map.getOrDefault("memo", "").toString();
Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
if (mat == null) {
@@ -136,6 +140,8 @@
}else {
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setAnfme(anfme);
+ orderDetl.setQty(qty);
+ orderDetl.setWorkQty(workQty);
orderDetl.setBatch(batch);
orderDetl.setMemo(memo);
orderDetl.setUpdateTime(new Date());
--
Gitblit v1.9.1