#修改 1. 字段优化 2. 别名字段返回

skyouc

2025-03-31 5829fb5f7252bb433b9b8f24d73d50afac1f224f

#修改
1. 字段优化
2. 别名字段返回

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -442,7 +442,7 @@
                    .setMatnrId(matnr.getId())
                    .setStockUnit(matnr.getStockUnit());
            QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
                    .eq(QlyInspect::getAsnItemId, asnOrderItem.getId()));
                    .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
            if (!Objects.isNull(inspect)) {
                //set 质检结果
                detlsDto.setInspect(inspect.getStatus$());

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

@@ -66,7 +66,7 @@
        return R.ok(qlyInspectService.getUnInspect());
    }

    @PostMapping("/qlyInspect/reports")
    @PostMapping("/qlyInspect/selected")
    @ApiOperation("选择质检单据")
    @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
    public R selectedOrder(IsptOrderParam param) {

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

@@ -3,7 +3,6 @@

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import jdk.jpackage.internal.Log;
import lombok.Data;
import lombok.experimental.Accessors;


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

@@ -176,7 +176,7 @@
        if (null == this.isptStatus) {return  null;}
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS)
                .eq(DictData::getValue, this.isptStatus));
        if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
            return null;

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

@@ -4,6 +4,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

@@ -17,6 +21,7 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Objects;

@Data
@Accessors(chain = true)
@@ -209,6 +214,18 @@
//            null    // 备注
//    );

    public String getIsptResult$() {
        if (null == this.isptResult) {return null; }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
                .eq(DictData::getValue, this.isptResult));
        if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
            return null;
        }
        return dictDatas.getLabel();
    }

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

 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java

@@ -25,7 +25,7 @@
    public final static String DICT_SYS_DEVICE_TYPE = "sys_device_type";

    /**
     * 单据业务类型
     * 单据业务类型DICT_SYS_TASK_TYPE
     */
    public final static String DICT_SYS_BUSINESS_TYPE = "sys_business_type";

@@ -34,4 +34,14 @@
     */
    public final static String DICT_SYS_ORDER_TYPE = "sys_order_type";

    /**
     * 质检状态
     */
    public final static String DICT_QLY_INSPECT_STATUS = "sys_qly_inspect_status";

    /**
     * 质检结论
     */
    public final static String DICT_INSPECT_RESULT = "sys_inspect_result";

}