chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增密炼物料皮重策略功能，包括相关实体、服务、控制器及接口，支持桌面端免密CRUD操作，优化打印记录与原料入场记录的衍生字段填充逻辑，提升用户体验。

Browse Source
This commit is contained in:
geht
2026-06-02 16:28:51 +08:00
parent 37239e1b0a
commit fef7d25e3c
75 changed files with 4407 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialEntry/MesXslRawMaterialEntry.data.ts
View File

@@ -17,8 +17,11 @@ export const columns: BasicColumn[] = [
{ title: '厂家物料名称', align: 'center', dataIndex: 'manufacturerMaterialName', width: 140, ellipsis: true },
{ title: '保质期', align: 'center', dataIndex: 'shelfLife', width: 100 },
{ title: '总重(KG)', align: 'center', dataIndex: 'totalWeight', width: 100 },
{ title: '托盘及皮重（合计）', align: 'center', dataIndex: 'palletTareTotal', width: 120 },
{ title: '总份数', align: 'center', dataIndex: 'totalPortions', width: 80 },
{ title: '每份总重(KG)', align: 'center', dataIndex: 'portionWeight', width: 110 },
{ title: '包装物皮重', align: 'center', dataIndex: 'portionPackagingTare', width: 110, ellipsis: true },
{ title: '托盘重量', align: 'center', dataIndex: 'portionPalletWeight', width: 100, ellipsis: true },
{ title: '每份包数', align: 'center', dataIndex: 'portionPackages', width: 80 },
{ title: '检测结果', align: 'center', dataIndex: 'testResult_dictText', width: 90 },
{ title: '检测状态', align: 'center', dataIndex: 'testStatus_dictText', width: 90 },
@@ -155,6 +158,12 @@ export const formSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: { min: 0, precision: 2, placeholder: '请输入总重', style: { width: '100%' } },
},
{
label: '托盘及皮重（合计）',
field: 'palletTareTotal',
component: 'InputNumber',
componentProps: { disabled: true, precision: 3, style: { width: '100%' } },
},
{
// 字段升级为字符串类型，支持桌面端拆码明细多行拼接（如 20/1/）
label: '总份数',
@@ -168,6 +177,18 @@ export const formSchema: FormSchema[] = [
component: 'Input',
componentProps: { placeholder: '请输入每份总重（多行明细用 / 拼接）', style: { width: '100%' } },
},
{
label: '包装物皮重',
field: 'portionPackagingTare',
component: 'Input',
componentProps: { disabled: true, placeholder: '拆码明细拼接（/ 分隔）' },
},
{
label: '托盘重量',
field: 'portionPalletWeight',
component: 'Input',
componentProps: { disabled: true, placeholder: '拆码明细拼接（/ 分隔）' },
},
{
label: '每份包数',
field: 'portionPackages',
@@ -258,7 +279,8 @@ export const superQuerySchema = {
materialName: { title: '物料名称', order: 4, view: 'text' },
supplierName: { title: '供应商名称', order: 5, view: 'text' },
totalWeight: { title: '总重(KG)', order: 6, view: 'number' },
testStatus: { title: '检测状态', order: 7, view: 'list', dictCode: 'xslmes_test_status' },
isSpecialAdoption: { title: '是否特采', order: 8, view: 'list', dictCode: 'yn' },
status: { title: '状态', order: 9, view: 'list', dictCode: 'xslmes_entry_status' },
palletTareTotal: { title: '托盘及皮重（合计）', order: 7, view: 'number' },
testStatus: { title: '检测状态', order: 8, view: 'list', dictCode: 'xslmes_test_status' },
isSpecialAdoption: { title: '是否特采', order: 9, view: 'list', dictCode: 'yn' },
status: { title: '状态', order: 10, view: 'list', dictCode: 'xslmes_entry_status' },
};