优化入库通知明细页

lbq

5 天以前 e21d8767d595eff3d700d7d0b9eeed3ed2317fef

优化入库通知明细页

 rsf-admin/src/i18n/zh.js

@@ -785,6 +785,11 @@
                saleUserName: '销售员',
                customerId: '客户编码',
                customerName: '客户',
                purchaseOrgName: '采购组织',
                purchaseUserName: '采购员',
                businessTime: '采购日期',
                supplierId: '供应商编码',
                supplierName: '供应商',
            },
            outStock: {
                code: "出库单号",

 rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx

@@ -142,10 +142,8 @@
        const result = await fetchInOrderItemFullColumns();
        if (result.success) {
            const hiddenSources = [
                'splrName',
                'businessTime', 'extendFields.[businessTime]',
                'wkType', 'extendFields.[wkType]',
                'type', 'extendFields.[type]'
                'splrName', 
                'type', 'extendFields.[type]',
            ];
            const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
            setColumns(columns);

 rsf-admin/src/page/orders/config/orderItemColumns.jsx

@@ -29,7 +29,15 @@

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="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" />
];

/**
@@ -66,9 +74,9 @@
    <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="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //批次
    <TextField source="batch" label="table.field.asnOrderItem.splrBatch" key="batch" />, //批次
    <TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //规格
    <TextField source="purUnit" label="table.field.asnOrderItem.unit" key="purUnit" />, //单位
    <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" />, //建议目标仓

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java

@@ -6,7 +6,6 @@
public class InOrderAndItem {

    private Long id;

    private String poCode;
    private String type;
    private String wkType$;
@@ -24,7 +23,7 @@
    private String anfme;
    private String qty;
    private String targetWarehouseId;
    private String username;
    private String createTime;
    private String updateBy;
    private String updateTime;

}

 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml

@@ -149,11 +149,10 @@
    <select id="queryFullOrderWithPaging" resultType="com.vincent.rsf.server.manager.entity.InOrderAndItem">
        SELECT mi.id, mo.po_code, mo.type, sd.label as wkType$, purchase_org_name, purchase_user_name, business_time,
               supplier_id, supplier_name, plat_work_code, plat_item_id, matnr_code, maktx, batch, stock_unit,
               mi.anfme, mi.qty, target_warehouse_id, username, mi.create_time
               mi.anfme, mi.qty, target_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
                 LEFT JOIN sys_user su ON mi.create_by = su.id AND su.tenant_id = mo.tenant_id
        ${ew.customSqlSegment}
    </select>
</mapper>