From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/views/order/orderDetl/index.vue | 47 +++++--
zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlMapper.xml | 28 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/CreateOrderParam.java | 6 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlLogMapper.java | 8 +
zy-asrs-admin/src/views/order/orderDetlLog/index.vue | 32 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlLogService.java | 6 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 26 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java | 22 ++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlMapper.java | 8 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 3
zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlLogMapper.xml | 28 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java | 17 ++
zy-asrs-admin/src/views/order/orderLog/index.vue | 17 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java | 9 +
zy-asrs-admin/src/components/order/order/orderOut.vue | 1
zy-asrs-admin/src/components/orderDetl/show.vue | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java | 21 ++-
zy-asrs-admin/src/components/order/order/edit.vue | 21 +++
19 files changed, 263 insertions(+), 44 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/edit.vue b/zy-asrs-admin/src/components/order/order/edit.vue
index 06a1d9b..283a282 100644
--- a/zy-asrs-admin/src/components/order/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/order/edit.vue
@@ -25,7 +25,7 @@
orderDetlChild.value.orderId = formData.value.id;
orderDetlChild.value.isAdd = isSave.value;
orderNoQuery();
- }else {
+ } else {
orderDetlChild.value.orderId = null;
}
})
@@ -46,6 +46,9 @@
orderNo: formData.value.orderNo,
orderType: formData.value.orderType,
orderSettle: formData.value.orderSettle,
+ address: formData.value.address,
+ phone: formData.value.phone,
+ customer: formData.value.customer,
list: orderDetlChild.value.tableData
}
@@ -138,14 +141,26 @@
optionLabelProp="label">
</a-select>
</a-form-item>
- <a-form-item v-if="!isSave" :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��')" name="orderSettle">
+ <a-form-item v-if="!isSave" :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��')"
+ name="orderSettle">
<a-select v-model:value="formData.orderSettle" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
style="width: 100%" show-search :options="orderSettleQueryList" optionFilterProp="label"
optionLabelProp="label">
</a-select>
</a-form-item>
+ <div>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '瀹㈡埛鍚嶇О')" name="customer">
+ <a-input v-model:value="formData.customer" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '鏀惰揣鍦板潃')" name="address">
+ <a-input v-model:value="formData.address" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '鐢佃瘽')" name="phone">
+ <a-input v-model:value="formData.phone" />
+ </a-form-item>
+ </div>
<a-form-item :label="formatMessage('db.man_order.update_time', '璁㈠崟鏄庣粏')" name="orderDetl">
- <OrderDetlComponent ref="orderDetlChild" v-if="open" :ioModel="props.ioModel"/>
+ <OrderDetlComponent ref="orderDetlChild" v-if="open" :ioModel="props.ioModel" />
</a-form-item>
<a-form-item>
<a-button type="primary" html-type="submit" ref="submitButton"
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 8ee1a03..223037e 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -182,7 +182,6 @@
function getPage() {
state.loading = true;
-
let apiUrl = '/api/order/page';
if (props.ioModel == 'in') {
apiUrl = '/api/order/in/page';
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index b80265d..6855793 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -225,7 +225,7 @@
<template>
<div>
- <a-modal v-model:open="openDetl" :width="showWidth" @ok="handleOk" @cancel="handleCancel">
+ <a-modal v-model:open="openDetl" :width="showWidth" @ok="handleOk" @cancel="handleCancel" style="width: 80%;">
<div class="component-header">
<div>
<h3>
diff --git a/zy-asrs-admin/src/views/order/orderDetl/index.vue b/zy-asrs-admin/src/views/order/orderDetl/index.vue
index 325b020..c83d85d 100644
--- a/zy-asrs-admin/src/views/order/orderDetl/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetl/index.vue
@@ -20,6 +20,7 @@
const state = reactive({
selectedRowKeys: [],
loading: false,
+ orderType: 1
});
let tableData = ref([]);
@@ -46,6 +47,27 @@
...getColumnSearchProps('orderNo'),
},
{
+ title: formatMessage('db.man_order_log.order_type', '鍗曟嵁绫诲瀷'),
+ dataIndex: 'orderType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderType$'),
+ },
+ {
+ title: formatMessage('db.man_order_detl.mat_id', '鐗╂枡'),
+ dataIndex: 'matId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matId$'),
+ },
+ {
+ title: formatMessage('db.man_order_detl.maktx', '鐗╂枡鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
title: formatMessage('db.man_order_detl.anfme', '鏁伴噺'),
dataIndex: 'anfme',
width: 140,
@@ -66,13 +88,7 @@
ellipsis: true,
...getColumnSearchProps('workQty'),
},
- {
- title: formatMessage('db.man_order_detl.mat_id', '鐗╂枡'),
- dataIndex: 'matId$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('matId$'),
- },
+
{
title: formatMessage('db.man_order_detl.batch', '鎵瑰彿'),
dataIndex: 'batch',
@@ -148,10 +164,10 @@
function getPage() {
state.loading = true;
-
post('/api/orderDetl/page', {
current: currentPage,
pageSize: pageSize,
+ orderType: state.orderType,
condition: searchInput.value
}).then((resp) => {
let result = resp.data;
@@ -237,8 +253,14 @@
<div>
<EditView ref="editChild" @tableReload="handleTableReload" />
<div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ <div>
+ <a-select v-model:value="state.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ :options="[
+ { label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 },]" style="width: 160px;margin: 0 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-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
@@ -247,13 +269,14 @@
<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="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/views/order/orderDetlLog/index.vue b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
index 15260b5..0a99690 100644
--- a/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
@@ -20,6 +20,8 @@
const state = reactive({
selectedRowKeys: [],
loading: false,
+ orderType: 1
+
});
let tableData = ref([]);
@@ -53,6 +55,13 @@
...getColumnSearchProps('anfme'),
},
{
+ title: formatMessage('db.man_order_log.order_type', '鍗曟嵁绫诲瀷'),
+ dataIndex: 'orderType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderType$'),
+ },
+ {
title: formatMessage('db.man_order_detl_log.qty', '宸插畬鎴愭暟閲�'),
dataIndex: 'qty',
width: 140,
@@ -72,6 +81,13 @@
width: 140,
ellipsis: true,
...getColumnSearchProps('matId$'),
+ },
+ {
+ title: formatMessage('db.man_order_detl.maktx', '鐗╂枡鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
},
{
title: formatMessage('db.man_order_detl_log.batch', '鎵瑰彿'),
@@ -152,6 +168,7 @@
post('/api/orderDetlLog/page', {
current: currentPage,
pageSize: pageSize,
+ orderType: state.orderType,
condition: searchInput.value
}).then((resp) => {
let result = resp.data;
@@ -237,8 +254,14 @@
<div>
<EditView ref="editChild" @tableReload="handleTableReload" />
<div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ <div>
+ <a-select v-model:value="state.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ :options="[
+ { label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 },]" style="width: 160px;margin: 0 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-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
@@ -247,13 +270,14 @@
<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="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/views/order/orderLog/index.vue b/zy-asrs-admin/src/views/order/orderLog/index.vue
index 2df1159..447c285 100644
--- a/zy-asrs-admin/src/views/order/orderLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderLog/index.vue
@@ -19,6 +19,7 @@
const state = reactive({
selectedRowKeys: [],
+ orderType: 1,
loading: false,
});
@@ -138,6 +139,7 @@
post('/api/orderLog/page', {
current: currentPage,
pageSize: pageSize,
+ orderType: state.orderType,
condition: searchInput.value
}).then((resp) => {
let result = resp.data;
@@ -223,8 +225,14 @@
<div>
<EditView ref="editChild" @tableReload="handleTableReload" />
<div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ <div>
+ <a-select v-model:value="state.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ :options="[
+ { label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 },]" style="width: 160px;margin: 0 10px;">
+ </a-select>
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;margin: 0 10px;" @search="onSearch" />
+ </div>
<div class="table-header-right">
<a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
@@ -233,13 +241,14 @@
<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="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-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java
index cbf9d66..950245e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java
@@ -1,6 +1,8 @@
package com.zy.asrs.wms.asrs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -18,10 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -34,9 +33,17 @@
@PostMapping("/orderDetl/page")
@CacheData(tableName = {"man_order_detl"})
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<OrderDetl, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetl.class);
- return R.ok().add(orderDetlService.page(pageParam, pageParam.buildWrapper(true)));
+ if (!Objects.isNull(map.get("orderType"))) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetl, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetl.class);
+ QueryWrapper<OrderDetl> queryWrapper = pageParam.buildWrapper(true);
+ IPage<OrderDetl> detls = orderDetlService.pageByType(pageParam, queryWrapper);
+ return R.ok().add(detls);
+ } else {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetl, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetl.class);
+ return R.ok().add(orderDetlService.page(pageParam, pageParam.buildWrapper(true)));
+ }
}
@PreAuthorize("hasAuthority('asrs:orderDetl:list')")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
index 345c30f..a341b8b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
@@ -1,9 +1,12 @@
package com.zy.asrs.wms.asrs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -18,10 +21,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -34,9 +34,17 @@
@PostMapping("/orderDetlLog/page")
@CacheData(tableName = {"man_order_detl_log"})
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
- return R.ok().add(orderDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
+ if (!Objects.isNull(map.get("orderType"))) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetl, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetl.class);
+ QueryWrapper<OrderDetl> queryWrapper = pageParam.buildWrapper(true);
+ IPage<OrderDetl> detls = orderDetlLogService.pageByType(pageParam, queryWrapper);
+ return R.ok().add(detls);
+ } else {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
+ return R.ok().add(orderDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
+ }
}
@PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
index bcf2089..d1449e0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wms.asrs.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
@@ -19,9 +20,6 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -55,6 +53,14 @@
*/
@ApiModelProperty(value= "璁㈠崟缂栧彿")
private String orderNo;
+
+ @ApiModelProperty("鍗曟嵁绫诲瀷")
+ @TableField(exist = false)
+ private Integer orderType;
+
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ @TableField(exist = false)
+ private String maktx;
/**
* 鏁伴噺
@@ -194,6 +200,18 @@
return qty;
}
+ public String getOrderType$() {
+ if (orderType == null) {return null;}
+ if (orderType == 1) {
+ return OrderType.UTC_IN_ORDER.desc;
+ } else if (orderType == 2) {
+ return OrderType.UTC_OUT_ORDER.desc;
+ } else {
+ return OrderType.PK_IN_ORDER.desc;
+ }
+ }
+
+
public String getOrderId$(){
OrderService service = SpringUtils.getBean(OrderService.class);
Order order = service.getById(this.orderId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/CreateOrderParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/CreateOrderParam.java
index f955237..5f5d8f8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/CreateOrderParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/CreateOrderParam.java
@@ -17,6 +17,12 @@
//鍗曟嵁鐘舵��
private Long orderSettle;
+ private String phone;
+
+ private String address;
+
+ private String customer;
+
//鍗曟嵁鏄庣粏
private List<HashMap<String,Object>> list;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlLogMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlLogMapper.java
index 2871b26..8b4c97f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlLogMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlLogMapper.java
@@ -1,12 +1,20 @@
package com.zy.asrs.wms.asrs.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.zy.asrs.wms.asrs.entity.OrderDetlLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface OrderDetlLogMapper extends BaseMapper<OrderDetlLog> {
+ IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, @Param(Constants.WRAPPER) QueryWrapper<OrderDetl> queryWrapper);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlMapper.java
index 8ec1424..88f2f1f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderDetlMapper.java
@@ -1,12 +1,20 @@
package com.zy.asrs.wms.asrs.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
+ IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, @Param(Constants.WRAPPER) QueryWrapper<OrderDetl> queryWrapper);
}
+
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlLogService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlLogService.java
index 3492350..a835179 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlLogService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlLogService.java
@@ -1,7 +1,12 @@
package com.zy.asrs.wms.asrs.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.zy.asrs.wms.asrs.entity.OrderDetlLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
import java.util.List;
@@ -9,4 +14,5 @@
List<OrderDetlLog> getOrderDetlByOrderId(String orderId);
+ IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, QueryWrapper<OrderDetl> queryWrapper);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java
index e9c85b2..95d7a83 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderDetlService.java
@@ -1,7 +1,11 @@
package com.zy.asrs.wms.asrs.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wms.asrs.entity.OrderDetl;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
import java.util.List;
@@ -11,4 +15,5 @@
List<OrderDetl> parseDetl(List<OrderDetl> list);
+ IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, QueryWrapper<OrderDetl> queryWrapper);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java
index f764961..ee8aa39 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java
@@ -1,6 +1,8 @@
package com.zy.asrs.wms.asrs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.zy.asrs.wms.asrs.entity.OrderDetlField;
import com.zy.asrs.wms.asrs.entity.OrderDetlFieldLog;
@@ -10,6 +12,8 @@
import com.zy.asrs.wms.asrs.service.OrderDetlFieldService;
import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,4 +35,9 @@
}
return orderDetlLogs;
}
+
+ @Override
+ public IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, QueryWrapper<OrderDetl> queryWrapper) {
+ IPage<OrderDetl> orders = this.baseMapper.pageByType(pageParam, queryWrapper);
+ return orders; }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java
index 323f3ae..872a8dd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,16 +1,19 @@
package com.zy.asrs.wms.asrs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zy.asrs.wms.asrs.entity.OrderDetlField;
import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.zy.asrs.wms.asrs.service.OrderDetlFieldService;
import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
import java.util.List;
@Service("orderDetlService")
@@ -37,4 +40,16 @@
}
return orderDetls;
}
+
+ /**
+ * @author Ryan
+ * @date 2025/7/7
+ * @description: 鑾峰彇璁㈠崟鏄庣粏
+ * @version 1.0
+ */
+ @Override
+ public IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, QueryWrapper<OrderDetl> queryWrapper) {
+ IPage<OrderDetl> orders = this.baseMapper.pageByType(pageParam, queryWrapper);
+ return orders;
+ }
}
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 2c9d272..dc85947 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
@@ -64,6 +64,9 @@
Order order = new Order();
order.setOrderNo(orderNo);
order.setOrderType(param.getOrderType());
+ order.setCustomer(param.getCustomer());
+ order.setPhone(param.getPhone());
+ order.setAddress(param.getAddress());
order.setOrderSettle(OrderSettleType.INIT.val());
order.setIoPri(orderUtils.getIoPri());
order.setOrderTime(format.format(new Date()));
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlLogMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlLogMapper.xml
index 4888ed8..f0a47a7 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlLogMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlLogMapper.xml
@@ -2,4 +2,32 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wms.asrs.mapper.OrderDetlLogMapper">
+ <select id="pageByType" resultType="com.zy.asrs.wms.asrs.entity.OrderDetl">
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ od.id,
+ o.order_type,
+ od.order_id,
+ od.order_no,
+ od.anfme,
+ od.qty,
+ mt.maktx,
+ od.work_qty,
+ od.mat_id,
+ od.batch,
+ od.pick_status,
+ od.create_time,
+ od.create_by,
+ od.`status`,
+ od.memo
+ FROM
+ man_order_detl od
+ LEFT JOIN man_order o ON od.order_id = o.id
+ LEFT JOIN man_mat mt ON od.mat_id = mt.id
+ )t
+ ${ew.customSqlSegment}
+ </select>
</mapper>
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlMapper.xml
index 0fadea7..54af494 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderDetlMapper.xml
@@ -2,4 +2,32 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wms.asrs.mapper.OrderDetlMapper">
+ <select id="pageByType" resultType="com.zy.asrs.wms.asrs.entity.OrderDetl">
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ od.id,
+ o.order_type,
+ od.order_id,
+ od.order_no,
+ od.anfme,
+ od.qty,
+ mt.maktx,
+ od.work_qty,
+ od.mat_id,
+ od.batch,
+ od.pick_status,
+ od.create_time,
+ od.create_by,
+ od.`status`,
+ od.memo
+ FROM
+ man_order_detl od
+ LEFT JOIN man_order o ON od.order_id = o.id
+ LEFT JOIN man_mat mt ON od.mat_id = mt.id
+ )t
+ ${ew.customSqlSegment}
+ </select>
</mapper>
--
Gitblit v1.9.1