Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-04-16 e2fd80c79a61079256a7406024c65da0d0d22c36

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx

@@ -367,7 +367,7 @@
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="rglar_id"
                                        source="rglarId"
                                        reference="serialRule"
                                        perPage={REFERENCE_INPUT_PAGESIZE}
                                    >

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

@@ -9,6 +9,8 @@
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.service.SerialRuleService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -366,8 +368,8 @@
    }

    public String getRglarId$(){
        BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
        BatchRegular batchRegular = service.getById(this.rglarId);
        SerialRuleService service = SpringUtils.getBean(SerialRuleService.class);
        SerialRule batchRegular = service.getById(this.rglarId);
        if (!Cools.isEmpty(batchRegular)){
            return String.valueOf(batchRegular.getCode());
        }