From 8ce2fc9e420f68e07512b9addaf514a09effb4a7 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 25 二月 2026 13:45:02 +0800
Subject: [PATCH] 优化出库明细界面
---
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 2
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 77 +++++++++++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 19 +++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java | 3
rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx | 16 ++--
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 13 ++++
rsf-admin/src/i18n/zh.js | 16 +++--
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 7 +-
rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx | 10 +-
rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx | 4
rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx | 9 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java | 3 +
12 files changed, 120 insertions(+), 59 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 4e7d00f..55c078c 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -360,8 +360,8 @@
areas: '鍙叆搴撳尯',
},
basStation: {
- stationName: '绔欑偣鍚嶇О',
- stationId: '绔欑偣缂栫爜',
+ stationName: '绔欑偣缂栫爜',
+ stationId: '绔欑偣鍚嶇О',
type: '绔欑偣绫诲瀷',
inAble: '鑳藉叆',
outAble: '鑳藉嚭',
@@ -799,9 +799,9 @@
poId: "DO鏍囪瘑",
type: "绫诲瀷",
wkType: "涓氬姟绫诲瀷",
- anfme: "搴斿嚭鏁伴噺",
- workQty: '瀹炲嚭鏁伴噺',
- qty: "瀹屾垚鏁�",
+ anfme: "搴斿彂鏁伴噺",
+ workQty: '鎵ц鏁伴噺',
+ qty: "瀹炲彂鏁伴噺",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
rleStatus: "閲婃斁鐘舵��",
@@ -812,6 +812,7 @@
saleUserName: '閿�鍞憳',
customerId: '瀹㈡埛缂栫爜',
customerName: '瀹㈡埛',
+ stockOrgName: '鍙戣揣缁勭粐',
},
checkOrder: {
code: "鐩樼偣鍗曞彿",
@@ -984,8 +985,9 @@
platItemId: '琛屽彿',
unit: '鍗曚綅',
targetWarehouseId: "浠撳簱",
- sourceWarehouseId: "璋冨嚭浠�",
- platWorkCode: '璁″垝璺熻釜鍙�'
+ sourceWarehouseId: "鍙戣揣缁勭粐",
+ platWorkCode: '璁″垝璺熻釜鍙�',
+ spec: '瑙勬牸',
},
asnOrderLog: {
code: "鍗曟嵁缂栫爜",
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index 49be844..882fcc8 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -199,7 +199,7 @@
<FunctionField
source="outAble"
label="table.field.basStation.outAble"
- render={record => record.inAble === 1 ? '鏄�' : '鍚�'}
+ render={record => record.outAble === 1 ? '鏄�' : '鍚�'}
/>
<NumberField source="area$" label="table.field.basStation.area" />
<FunctionField
diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx
index 47f456d..c5be88a 100644
--- a/rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx
@@ -90,7 +90,7 @@
label="table.field.companys.code"
source="code"
parse={v => v}
- readOnly
+ validate={[required()]}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -98,15 +98,16 @@
label="table.field.companys.name"
source="name"
parse={v => v}
+ validate={[required()]}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.companys.nameEn"
source="nameEn"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.companys.breifCode"
@@ -124,7 +125,7 @@
parse={v => v}
validate={[required()]} />
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.companys.contact"
source="contact"
@@ -165,15 +166,14 @@
source="city"
parse={v => v}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.companys.address"
source="address"
parse={v => v}
/>
</Grid>
-
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
</Grid>
@@ -181,7 +181,7 @@
<Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
</Stack>
- </Grid>
+ </Grid> */}
</Grid>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
diff --git a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
index 9cd224a..c5c8818 100644
--- a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
@@ -98,7 +98,7 @@
title={"menu.asnOrderItem"}
empty={false}
filters={filters}
- // sort={{ field: "mo.create_time", order: "desc" }}
+ sort={{ field: "id", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -142,7 +142,7 @@
const result = await fetchInOrderItemFullColumns();
if (result.success) {
const hiddenSources = [
- 'splrName',
+ 'splrName', 'spec', 'createBy', 'createTime', 'createBy$',
'type', 'extendFields.[type]',
];
const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 6448da6..f301bde 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -30,14 +30,44 @@
export const getInOrderItemFullBaseColumns = () => [
<TextField source="poCode" label="table.field.asnOrder.poCode" key="poCode" />,
<TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />,
-
<TextField source="purchaseOrgName" label="table.field.asnOrder.purchaseOrgName" key="purchaseOrgName" />,
<TextField source="purchaseUserName" label="table.field.asnOrder.purchaseUserName" key="purchaseUserName" />,
<DateField source="businessTime" label="table.field.asnOrder.businessTime" key="businessTime" />,
<TextField source="supplierId" label="table.field.asnOrder.supplierId" key="supplierId" />,
<TextField source="supplierName" label="table.field.asnOrder.supplierName" key="supplierName" />,
-
// <TextField source="batch" label="table.field.asnOrder.batch" key="batch" />
+];
+
+/**
+ * 鑾峰彇鍏ュ簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
+ * @returns {Array} 鍩虹鍒楁暟缁�
+ */
+export const getInOrderItemBaseColumns = () => [
+ <NumberField source="id" key="id" />, // id
+ // <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
+ // <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
+ // <TextField source="splrName" label="table.field.asnOrderItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
+ <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" key="platItemId" />, //琛屽彿
+ <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
+ <TruncatedTextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
+ <TextField source="batch" label="table.field.asnOrderItem.splrBatch" key="batch" />, //鎵规
+ <TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
+ <TextField source="stockUnit" label="table.field.asnOrderItem.unit" key="stockUnit" />, //鍗曚綅
+ <NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
+ <TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
+];
+
+export const getOutOrderItemFullBaseColumns = () => [
+ <TextField source="poCode" label="table.field.asnOrder.poCode" key="poCode" />,
+ <TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />,
+ <TextField source="saleOrgName" label="閿�鍞粍缁�" key="saleOrgName" />,
+ <TextField source="saleUserName" label="閿�鍞憳" key="saleUserName" />,
+ <DateField source="businessTime" label="鍑哄簱鏃ユ湡" key="businessTime" />,
+ <TextField source="customerId" label="瀹㈡埛缂栫爜" key="customerId" />,
+ <TextField source="customerName" label="瀹㈡埛" key="customerName" />,
+ // <TextField source="stockOrgName" label="table.field.outStock.stockOrgName" key="saleOrgName" />,
];
/**
@@ -46,10 +76,10 @@
*/
export const getOutOrderItemBaseColumns = () => [
<NumberField source="id" key="id" />, // id
- <TextField source="orderCode" label="table.field.outStockItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+ // <TextField source="orderCode" label="table.field.outStockItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
<TextField source="platWorkCode" label="table.field.outStockItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
- <TextField source="splrCode" label="table.field.outStockItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
- <TextField source="splrName" label="table.field.outStockItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
+ // <TextField source="splrCode" label="table.field.outStockItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
+ // <TextField source="splrName" label="table.field.outStockItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
<TextField source="platItemId" label="table.field.outStockItem.platItemId" key="platItemId" />, //琛屽彿
<TextField source="matnrCode" label="table.field.outStockItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
<TruncatedTextField source="maktx" label="table.field.outStockItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
@@ -61,26 +91,7 @@
<TextField source="sourceWarehouseId" label="table.field.outStockItem.sourceWarehouseId" key="sourceWarehouseId" />, //璋冨嚭浠�
];
-/**
- * 鑾峰彇鍏ュ簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
- * @returns {Array} 鍩虹鍒楁暟缁�
- */
-export const getInOrderItemBaseColumns = () => [
- <NumberField source="id" key="id" />, // id
- <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
- <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
- <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" key="platItemId" />, //琛屽彿
- <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
- <TruncatedTextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
- <TextField source="batch" label="table.field.asnOrderItem.splrBatch" key="batch" />, //鎵规
- <TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
- <TextField source="stockUnit" label="table.field.asnOrderItem.unit" key="stockUnit" />, //鍗曚綅
- <NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
- <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
- <TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
-];
+
@@ -129,6 +140,14 @@
];
};
+export const buildOutOrderItemFullColumns = () => {
+ return [
+ ...getOutOrderItemFullBaseColumns(),
+ ...getOutOrderItemBaseColumns(),
+ ...getLastColumns()
+ ];
+};
+
/**
* 鑾峰彇鍔ㄦ�佸瓧娈靛苟鏋勫缓瀹屾暣鍒楅厤缃�
* @returns {Promise<{success: boolean, columns?: Array, msg?: string}>}
@@ -160,3 +179,11 @@
return { success: false, msg: error.message };
}
};
+
+export const fetchOutOrderItemFullColumns = async () => {
+ try {
+ return { success: true, columns: buildOutOrderItemFullColumns() };
+ } catch (error) {
+ return { success: false, msg: error.message };
+ }
+};
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx b/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx
index 5377e12..33568b9 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx
@@ -141,14 +141,19 @@
source="customerName"
readOnly
parse={v => v}
- />
+ />
+ <TextInput
+ label="table.field.outStock.stockOrgName"
+ source="stockOrgName"
+ readOnly
+ parse={v => v}
+ />
{/* <TextInput
label="table.field.outStock.logisNo"
source="logisNo"
readOnly
parse={v => v}
/> */}
-
{/* <DateInput
label="table.field.outStock.arrTime"
source="arrTime"
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 81563ec..a2ccae7 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -174,7 +174,7 @@
bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'code', 'createTime', 'createBy$', 'memo', 'rleStatus$', 'logisNo', 'updateBy$', 'workQty', 'updateTime']}
+ omit={['id', 'code', 'createTime', 'createBy$', 'memo', 'rleStatus$', 'logisNo', 'updateBy$', 'workQty', 'updateTime', 'type$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
@@ -197,11 +197,12 @@
<TextField source="saleUserName" label="閿�鍞憳" />
<DateField source="businessTime" label="鍑哄簱鏃ユ湡" />
<TextField source="customerId" label="瀹㈡埛缂栫爜" />
- <TextField source="customerName" label="瀹㈡埛" />
+ <TextField source="customerName" label="瀹㈡埛" />
+ <TextField source="stockOrgName" label="table.field.outStock.stockOrgName" />
<BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
<WrapperField cellClassName="opt" label="common.field.opt" >
- <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
+ {/* <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} /> */}
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
<CancelButton />
<CompleteButton />
diff --git a/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx b/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
index 3fa70ae..8d69432 100644
--- a/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
+++ b/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
@@ -40,7 +40,7 @@
import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import { fetchOutOrderItemColumns } from '../config/orderItemColumns';
+import { fetchOutOrderItemFullColumns } from '../config/orderItemColumns';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -98,7 +98,7 @@
<>
<Box display="flex">
<List
- resource="asnOrderItem/out"
+ resource="asnOrderItemFull/out"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -110,7 +110,7 @@
title={"menu.asnOrderItem"}
empty={false}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "id", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -147,7 +147,7 @@
}, []);
const getDynamicFields = async () => {
- const result = await fetchOutOrderItemColumns();
+ const result = await fetchOutOrderItemFullColumns();
if (result.success) {
setColumns(result.columns);
} else {
@@ -173,7 +173,7 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'createBy', 'createTime']}
+ omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'projectCode', 'createBy', 'createTime']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index 0586e31..c21ac86 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -5,6 +5,7 @@
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.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -15,10 +16,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.InOrderAndItem;
-import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.WkOrderItem;
-import com.vincent.rsf.server.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -157,6 +155,19 @@
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍑哄簱鍒楄〃")
+ @PostMapping("/asnOrderItemFull/out/page")
+ public R pageOutFull(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
+ wrapper.eq("mo.type", OrderType.ORDER_OUT.type);
+
+ IPage<OutOrderAndItem> page = asnOrderItemMapper.queryFullOutOrderWithPaging(pageParam, wrapper);
+ return R.ok(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrderItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(asnOrderItemService.list());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
index 49d56e5..50ee0e0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
@@ -325,7 +325,7 @@
//
public WkOrderItem() {}
- public WkOrderItem(Long asnId, String asnCode, Long poDetlId, String matnrCode, String poCode, Long matnrId, String matnk, Double anfme, String stockUnit, Double purQty, String purUnit, Double qty, String splrCode, String splrName, String qrcode, String barcode, String packName, Integer status, Integer ntyStatus, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public WkOrderItem(Long asnId, String asnCode, Long poDetlId, String matnrCode, String poCode, Long matnrId, String matnk, Double anfme, String stockUnit, Double purQty, String purUnit, Double qty, String splrCode, String splrName, String qrcode, String barcode, String packName, Integer status, Integer ntyStatus, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, String sourceWarehouseId) {
this.orderId = asnId;
this.orderCode = asnCode;
this.poDetlId = poDetlId;
@@ -352,6 +352,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.sourceWarehouseId = sourceWarehouseId;
}
// AsnOrderItem asnOrderItem = new AsnOrderItem(
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
index 19e8756..ce58bca 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
@@ -7,6 +7,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.InOrderAndItem;
+import com.vincent.rsf.server.manager.entity.OutOrderAndItem;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -27,4 +28,6 @@
List<InOrderAndItem> queryFullOrder();
IPage<InOrderAndItem> queryFullOrderWithPaging(PageParam<WkOrderItem, BaseParam> pageParam, @Param(Constants.WRAPPER) QueryWrapper<WkOrderItem> wrapper);
+
+ IPage<OutOrderAndItem> queryFullOutOrderWithPaging(PageParam<WkOrderItem, BaseParam> pageParam, @Param(Constants.WRAPPER) QueryWrapper<WkOrderItem> wrapper);
}
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 65e28f7..1bb958d 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -44,6 +44,7 @@
aoi.pack_name,
aoi.nty_status,
aoi.`status`,
+ aoi.source_warehouse_id,
CASE
aoi.ispt_result
WHEN 0 THEN
@@ -153,6 +154,16 @@
FROM man_asn_order_item mi
LEFT JOIN man_asn_order mo ON mi.order_id = mo.id AND mo.tenant_id = mi.tenant_id
LEFT JOIN sys_dict_data sd ON sd.dict_type_id = 27 and mo.wk_type = sd.`value` AND sd.tenant_id = mo.tenant_id
- ${ew.customSqlSegment}
+ ${ew.customSqlSegment}
+ </select>
+
+ <select id="queryFullOutOrderWithPaging" resultType="com.vincent.rsf.server.manager.entity.OutOrderAndItem">
+ SELECT mi.id, mo.po_code, mo.type, sd.label as wkType$, sale_org_name, sale_user_name, business_time,
+ customer_id, customer_name, plat_work_code, plat_item_id, matnr_code, maktx, batch, stock_unit,
+ mi.anfme, mi.qty, source_warehouse_id, mi.update_by, mi.update_time
+ FROM man_asn_order_item mi
+ LEFT JOIN man_asn_order mo ON mi.order_id = mo.id AND mo.tenant_id = mi.tenant_id
+ LEFT JOIN sys_dict_data sd ON sd.dict_type_id = 27 and mo.wk_type = sd.`value` AND sd.tenant_id = mo.tenant_id
+ ${ew.customSqlSegment}
</select>
</mapper>
--
Gitblit v1.9.1