#修改 1. 库位添加仓库字段 2. 库位界面仓库，库区字段界面修改

skyouc

2025-02-26 3c77b4958b2a06b62721560b4d306b901651e5c6

#修改
1. 库位添加仓库字段
2. 库位界面仓库，库区字段界面修改

 rsf-admin/src/i18n/en.js

@@ -298,23 +298,24 @@
                flagMix: "flagMix",
            },
            loc: {
                areaId: "areaId",
                code: "code",
                type: "type",
                name: "name",
                flagLogic: "flagLogic",
                fucAtrrs: "fucAtrrs",
                barcode: "barcode",
                unit: "unit",
                size: "size",
                row: "row",
                col: "col",
                lev: "lev",
                channel: "channel",
                maxParts: "maxParts",
                maxPack: "maxPack",
                flagLabelMange: "flagLabelMange",
                locAttrs: "locAttrs",
                warehouseId: "Warehouse",
                areaId: "Area",
                code: "Code",
                type: "Type",
                name: "Name",
                flagLogic: "FlagLogic",
                fucAtrrs: "FucAtrrs",
                barcode: "Barcode",
                unit: "Unit",
                size: "Size",
                row: "Row",
                col: "Col",
                lev: "Lev",
                channel: "Channel",
                maxParts: "MaxParts",
                maxPack: "MaxPack",
                flagLabelMange: "FlagLabelMange",
                locAttrs: "LocAttrs",
            },
            container: {
                code: "code",

 rsf-admin/src/i18n/zh.js

@@ -298,7 +298,8 @@
                flagMix: "混放",
            },
            loc: {
                areaId: "库区标识",
                warehouseId: "仓库",
                areaId: "库区",
                code: "编码",
                type: "类型",
                name: "名称",

 rsf-admin/src/page/loc/LocCreate.jsx

@@ -86,6 +86,19 @@
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="warehouseId$"
                                        reference="warehouse"
                                    >
                                        <AutocompleteInput
                                            label="table.field.loc.warehouseId"
                                            optionText="name"
                                            validate={[required()]}
                                            filterToQuery={(val) => ({ name: val })}
                                        />
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                    >
@@ -165,7 +178,7 @@
                                        source="col"
                                        validate={required()}
                                    />
                                     <NumberInput
                                    <NumberInput
                                        label="table.field.loc.lev"
                                        source="lev"
                                        validate={required()}

 rsf-admin/src/page/loc/LocEdit.jsx

@@ -66,6 +66,19 @@
                        <Grid container rowSpacing={2} columnSpacing={2}>
                            <Grid item xs={6} display="flex" gap={1}>
                                <ReferenceInput
                                    source="warehouseId$"
                                    reference="warehouse"
                                >
                                    <AutocompleteInput
                                        label="table.field.loc.warehouseId"
                                        optionText="name"
                                        validate={[required()]}
                                        filterToQuery={(val) => ({ name: val })}
                                    />
                                </ReferenceInput>
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <ReferenceInput
                                    source="areaId"
                                    reference="warehouseAreas"
                                >

 rsf-admin/src/page/loc/LocList.jsx

@@ -63,7 +63,8 @@
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <NumberInput source="areaId" label="table.field.loc.areaId" />,
    <NumberField source="warehouseId$" label="table.field.loc.warehouseId" />,
    <NumberField source="areaId$" label="table.field.loc.areaId" />,
    <TextInput source="code" label="table.field.loc.code" />,
    <TextInput source="type" label="table.field.loc.type" />,
    <TextInput source="name" label="table.field.loc.name" />,
@@ -133,7 +134,8 @@
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <NumberField source="areaId" label="table.field.loc.areaId" />
                    <NumberField source="warehouseId$" label="table.field.loc.warehouseId" />,
                    <NumberField source="areaId$" label="table.field.loc.areaId" />
                    <TextField source="code" label="table.field.loc.code" />
                    <TextField source="type" label="table.field.loc.type" />
                    <TextField source="name" label="table.field.loc.name" />
@@ -150,7 +152,6 @@
                    <NumberField source="maxPack" label="table.field.loc.maxPack" />
                    <NumberField source="flagLabelMange" label="table.field.loc.flagLabelMange" />
                    <TextField source="locAttrs" label="table.field.loc.locAttrs" />

                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>

 rsf-admin/src/page/loc/LocPanel.jsx

@@ -42,6 +42,12 @@
                    <Grid container spacing={2}>
                        <Grid item xs={3}>
                            <PanelTypography
                                title="table.field.loc.warehouseId" 
                                property={record.warehouseId}
                            />
                        </Grid>
                        <Grid item xs={3}>
                            <PanelTypography
                                title="table.field.loc.areaId" 
                                property={record.areaId}
                            />

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

@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "往来企业")
@RestController
public class CompanysController extends BaseController {


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

@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;


@RestController
public class LocController extends BaseController {


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

@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "质检")
@RestController
public class QlyInspectController extends BaseController {


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

@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.Stock;
import com.vincent.rsf.server.manager.service.StockService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库存信息")
@RestController
public class StockController extends BaseController {


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

@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.StockItem;
import com.vincent.rsf.server.manager.service.StockItemService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库存明细")
@RestController
public class StockItemController extends BaseController {


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

@@ -3,15 +3,12 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.manager.service.WarehouseService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -19,7 +16,6 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_loc")
@@ -34,6 +30,11 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 仓库标识
     */
    @ApiModelProperty(value = "仓库标识")
    private Long warehouseId;
    /**
     * 库区标识
     */
@@ -189,7 +190,8 @@

    public Loc() {}

    public Loc(Long areaId,String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,Integer lrow,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public Loc(Long areaId, Long warehouseId, String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,Integer lrow,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.warehouseId = warehouseId;
        this.areaId = areaId;
        this.code = code;
        this.type = type;
@@ -245,6 +247,24 @@
//            null    // 备注
//    );

    public String getWarehouseId$() {
        WarehouseService service = SpringUtils.getBean(WarehouseService.class);
        Warehouse warehouse = service.getById(this.warehouseId);
        if (!Cools.isEmpty(warehouse)) {
            return String.valueOf(warehouse.getName());
        }
        return null;
    }

    public String gerAreaId$() {
        WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
        WarehouseAreas areas = service.getById(this.areaId);
        if (!Cools.isEmpty(areas)) {
            return String.valueOf(areas.getName());
        }
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){

 rsf-server/src/main/java/serialRule.sql

@@ -1,28 +1,28 @@
-- save serialRule record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.serialRule', '0', '/system/serialRule', 'serialRule', '0' , '0', '1' , '1');
--insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.serialRule', '0', '/system/serialRule', 'serialRule', '0' , '0', '1' , '1');

insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 字典数据集', '123', '1', 'system:serialRule:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 字典数据集', '123', '1', 'system:serialRule:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 字典数据集', '123', '1', 'system:serialRule:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 字典数据集', '123', '1', 'system:serialRule:remove', '3', '1', '1');
--insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 字典数据集', '123', '1', 'system:serialRule:list', '0', '1', '1');
--insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 字典数据集', '123', '1', 'system:serialRule:save', '1', '1', '1');
--insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 字典数据集', '123', '1', 'system:serialRule:update', '2', '1', '1');
--insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 字典数据集', '123', '1', 'system:serialRule:remove', '3', '1', '1');

-- locale menu name
serialRule: 'SerialRule',

-- locale field
serialRule: {
    code: "code",
    name: "name",
    delimit: "delimit",
    reset: "reset",
    resetDep: "resetDep",
    currValue: "currValue",
    lastCode: "lastCode",
},

-- ResourceContent
import serialRule from './serialRule';

case 'serialRule':
    return serialRule;
--serialRule: 'SerialRule',
--
---- locale field
--serialRule: {
--    code: "code",
--    name: "name",
--    delimit: "delimit",
--    reset: "reset",
--    resetDep: "resetDep",
--    currValue: "currValue",
--    lastCode: "lastCode",
--},
--
---- ResourceContent
--import serialRule from './serialRule';
--
--case 'serialRule':
--    return serialRule;