优化出库页面字段

lbq

21 小时以前 fa1fa26cd00c6a883990fdaaa3ea303b3f053c26

优化出库页面字段

 rsf-admin/src/i18n/zh.js

@@ -779,7 +779,12 @@
                arrTime: "预计到达时间",
                rleStatus: "释放状态",
                ntyStatus: "上报状态",
                exceStatus: '单据状态'
                exceStatus: '单据状态',
                saleDate: '出库日期',
                saleOrgName: '销售组织',
                saleUserName: '销售员',
                customerId: '客户编码',
                customerName: '客户',
            },
            outStock: {
                code: "出库单号",
@@ -795,6 +800,11 @@
                rleStatus: "释放状态",
                ntyStatus: "上报状态",
                exceStatus: '单据状态',
                saleDate: '出库日期',
                saleOrgName: '销售组织',
                saleUserName: '销售员',
                customerId: '客户编码',
                customerName: '客户',
            },
            checkOrder: {
                code: "盘点单号",
@@ -968,6 +978,7 @@
                unit: '单位',
                targetWarehouseId: "仓库",
                sourceWarehouseId: "调出仓",
                platWorkCode: '计划跟踪号'
            },
            asnOrderLog: {
                code: "单据编码",

 rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx

@@ -93,7 +93,13 @@
                                    parse={v => v}
                                    readOnly
                                /> */}
                                <AutocompleteInput
                                <TextInput
                                    label="table.field.asnOrder.wkType"
                                    source="wkType$"
                                    readOnly
                                    parse={v => v}
                                />
                                {/* <AutocompleteInput
                                    choices={business}
                                    optionText="label"
                                    label="table.field.asnOrder.wkType"
@@ -101,7 +107,7 @@
                                    optionValue="value"
                                    parse={v => v}
                                    readOnly
                                />
                                /> */}
                                <TextInput
                                    label="table.field.asnOrder.anfme"
                                    source="anfme"

 rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx

@@ -61,19 +61,19 @@
                                {translate('common.edit.title.main')}
                            </Typography>
                            <Stack direction='row' gap={2}>
                                <TextInput
                                {/* <TextInput
                                    label="table.field.outStock.code"
                                    source="code"
                                    readOnly
                                    parse={v => v}
                                />
                                /> */}
                                <TextInput
                                    label="table.field.outStock.poCode"
                                    source="poCode"
                                    readOnly
                                    parse={v => v}
                                />
                                <AutocompleteInput
                                {/* <AutocompleteInput
                                    choices={dicts}
                                    optionText="label"
                                    label="table.field.outStock.type"
@@ -81,21 +81,25 @@
                                    optionValue="value"
                                    parse={v => v}
                                    readOnly
                                /> */}
                                <TextInput
                                    label="table.field.outStock.wkType"
                                    source="wkType$"
                                    readOnly
                                    parse={v => v}
                                />
                                <AutocompleteInput
                                {/* <AutocompleteInput
                                    choices={business}
                                    optionText="label"
                                    label="table.field.outStock.wkType"
                                    source="wkType"
                                    source="wkType$"
                                    optionValue="value"
                                    parse={v => v}
                                    readOnly
                                />
                            </Stack>
                            <Stack direction='row' gap={2}>
                                /> */}
                                <TextInput
                                    label="table.field.outStock.logisNo"
                                    source="logisNo"
                                    label="table.field.outStock.saleDate"
                                    source="businessTime"
                                    readOnly
                                    parse={v => v}
                                />
@@ -111,12 +115,46 @@
                                    readOnly
                                    parse={v => v}
                                />
                                <DateInput
                            </Stack>
                            <Stack direction='row' gap={2}>
                                {/* 银座新增 */}
                                <TextInput
                                    label="table.field.outStock.saleOrgName"
                                    source="saleOrgName"
                                    readOnly
                                    parse={v => v}
                                />
                                <TextInput
                                    label="table.field.outStock.saleUserName"
                                    source="saleUserName"
                                    readOnly
                                    parse={v => v}
                                />
                                <TextInput
                                    label="table.field.outStock.customerId"
                                    source="customerId"
                                    readOnly
                                    parse={v => v}
                                />
                                <TextInput
                                    label="table.field.outStock.customerName"
                                    source="customerName"
                                    readOnly
                                    parse={v => v}
                                />   
                                {/* <TextInput
                                    label="table.field.outStock.logisNo"
                                    source="logisNo"
                                    readOnly
                                    parse={v => v}
                                /> */}

                                {/* <DateInput
                                    label="table.field.outStock.arrTime"
                                    source="arrTime"
                                    readOnly
                                />
                                <SelectInput
                                /> */}
                                {/* <SelectInput
                                    label="table.field.outStock.rleStatus"
                                    source="rleStatus"
                                    readOnly
@@ -125,7 +163,7 @@
                                        { id: 1, name: ' 已释放' },
                                    ]}
                                    validate={required()}
                                />
                                /> */}
                            </Stack>
                        </Grid>
                    </Grid>

 rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx

@@ -193,10 +193,11 @@
      )}
      {columns.length > 0 &&
        <StyledDatagrid
          preferenceKey='asnOrderItem'
          preferenceKey='outStockItem'
          bulkActionButtons={false}
          rowClick={(id, resource, record) => false}
          omit={['id', 'orderId', 'orderCode', 'poDetlId', 'poDetlCode', 'platOrderCode', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'workQty']}
          omit={['id', 'orderId', 'orderCode', 'poDetlId', 'poDetlCode', 'platOrderCode', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 
            'qrcode', 'trackCode', 'splrCode', 'projectCode', 'workQty', 'createBy', 'createTime', 'createBy$', 'sourceWareHouseId', 'splrName', 'supplierName']}
        >
          {columns.map((column) => column)}
        </StyledDatagrid>}

 rsf-admin/src/page/orders/outStock/OutOrderList.jsx

@@ -195,7 +195,7 @@
          {/* 银座新增 */}
          <TextField source="saleOrgName" label="销售组织" />
          <TextField source="saleUserName" label="销售员" />
          <TextField source="saleDate" label="出库日期" />
          <DateField source="businessTime" label="出库日期" />
          <TextField source="customerId" label="客户编码" />
          <TextField source="customerName" label="客户" />     


 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
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.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -14,12 +15,14 @@
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.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
@@ -32,6 +35,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,6 +52,9 @@

    @Autowired
    private CompanysService companysService;
    @Resource
    private AsnOrderItemMapper asnOrderItemMapper;


    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @ApiOperation("分页获取列表")
@@ -104,6 +111,20 @@

    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @ApiOperation("分页获取列表")
    @PostMapping("/asnOrderItemFull/in/page")
    public R pageInFull(@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);
        // 添加type为'in'的条件，注意这里应该指定表别名
        wrapper.eq("mo.type", OrderType.ORDER_IN.type);
        
        IPage<InOrderAndItem> page = asnOrderItemMapper.queryFullOrderWithPaging(pageParam, wrapper);
        return R.ok(page);
    }

    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @ApiOperation("分页获取列表")
    @PostMapping("/asnOrderItem/out/page")
    public R pageOut(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);

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

New file
@@ -0,0 +1,28 @@
package com.vincent.rsf.server.manager.entity;

import lombok.Data;

@Data
public class InOrderAndItem {

    private String poCode;
    private String type;
    private String wkType$;
    private String purchaseOrgName;
    private String purchaseUserName;
    private String businessTime;
    private String supplierId;
    private String supplierName;
    private String platWorkCode;
    private String platItemId;
    private String matnrCode;
    private String maktx;
    private String batch;
    private String stockUnit;
    private String anfme;
    private String qty;
    private String targetWarehouseId;
    private String username;
    private String createTime;

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java

@@ -6,12 +6,14 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
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.WkOrderItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Map;

@Mapper
@@ -22,4 +24,7 @@

    WkOrderItem resultById(@Param(Constants.WRAPPER) LambdaQueryWrapper<WkOrderItem> buildWrapper);

    List<InOrderAndItem> queryFullOrder();

    IPage<InOrderAndItem> queryFullOrderWithPaging(PageParam<WkOrderItem, BaseParam> pageParam, @Param(Constants.WRAPPER) QueryWrapper<WkOrderItem> wrapper);
}

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

@@ -134,4 +134,26 @@
            ) t
            ${ew.customSqlSegment}
    </select>

    <select id="queryFullOrder" resultType="com.vincent.rsf.server.manager.entity.InOrderAndItem">
        SELECT mo.po_code, mo.type, sys_dict_data.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
        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 ON sys_dict_data.dict_type_id = 27 and mo.wk_type = sys_dict_data.`value`
                 LEFT JOIN sys_user ON mi.create_by = sys_user.id AND sys_user.tenant_id = mi.tenant_id
        WHERE mo.type = 'in'
    </select>

    <select id="queryFullOrderWithPaging" resultType="com.vincent.rsf.server.manager.entity.InOrderAndItem">
        SELECT 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
        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>