edit queryVo

Fancy

2024-06-20 7f8dbce72bf2ed80d164d86944b0bbc3d3720a64

edit queryVo

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java

New file
@@ -0,0 +1,28 @@
package com.dy.pmsStation.workOrder;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.webUtil.QueryConditionVo;
import lombok.*;

@Data
@EqualsAndHashCode(callSuper = false)
@ToString(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class QueryVo {
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long id;
    public String userId;
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long lineId;
    public String stationId;
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long planId;
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long processId;
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    public Long nodeId;
    public String assistants;
}

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java

@@ -27,13 +27,13 @@
     * @param
     * @return
     */
    @GetMapping(path="isStationUsed")
    public BaseResponse<Boolean> isStationUsed(StaAssemblyWorkLast last){
        String message = sv.checkStationIsUsed(last);
        if ("OK".equals(message.split("^")[0])) {
            return BaseResponseUtils.buildSuccess(true);
    @GetMapping(path="checkStationUsed")
    public BaseResponse<Boolean> isStationUsed(QueryVo last){
        String message = sv.checkStationUsed(last);
        if ("FALSE".equals(message.split("\\^")[0])) {
            return BaseResponseUtils.buildFail(message.split("\\^")[1]);
        } else {
            return BaseResponseUtils.buildFail(message);
            return BaseResponseUtils.buildSuccess(true);
        }
    }
    /**
@@ -48,7 +48,6 @@
        List<PrAssemblyPlan> list = sv.selectList(params);
        return BaseResponseUtils.buildSuccess(list);
    }


    @GetMapping(path = "test")
    public BaseResponse test() {

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java

@@ -41,58 +41,63 @@
        this.assemblyWorkLastDao = assemblyWorkLastDao;
    }

    public String checkUser(Long id){
        Long userId = id;
    public String checkUser(String id){
        Long userId = null;
        String message = "USER";
        //工站103
        if(userId != null && userId.toString().startsWith("103")){
            message = checkStation(id);
            return message;
        }
        if(userId == null){
        if(StringUtils.isBlank(id)){
            message = "FALSE^员工编码不能为空";
            return message;
        }
        //工站103
        if((!StringUtils.isBlank(id)) && id.toString().startsWith("103")){
            message = checkStation(id);
            return message;
        }
        //用户101
        if(userId.toString().startsWith("101")){
            userId = Long.parseLong(userId.toString().substring(3));
        if(id.toString().startsWith("101")){
            userId = Long.parseLong(id.toString().substring(3));
        }else{
            userId = Long.parseLong(id.toString());
        }
        BaUser userInfo = baUserDao.selectByPrimaryKey(userId);
        if(userInfo == null){
            message = "FALSE^员工编码不在系统中,请先维护员工信息";
            message = "FALSE^员工编码:"+ userId +"不在系统中,请先维护员工信息";
            return message;
        }
        message += "^"+ userId;
        return message;
    }

    public String checkStation(Long id){
        Long stationId = id;
    public String checkStation(String id){
        Long stationId = null;
        String message = "STATION";
        //用户101
        if(stationId != null && stationId.toString().startsWith("101")){
            message = checkUser(id);
            return message;
        }
        if(stationId == null){
        if(StringUtils.isBlank(id)){
            message = "FALSE^工站编码不能为空";
            return message;
        }
        //用户101
        if((!StringUtils.isBlank(id)) && id.toString().startsWith("101")){
            message = checkUser(id);
            return message;
        }
        //工站103
        if(stationId.toString().startsWith("103")){
            stationId = Long.parseLong(stationId.toString().substring(3));
        if(id.toString().startsWith("103")){
            stationId = Long.parseLong(id.toString().substring(3));
        }else{
            stationId = Long.parseLong(id.toString());
        }
        PltStation record = new PltStation();
        record.setId(stationId);
        List<PltStation> stationInfo = pltStationDao.selectStationList(record);
        if(stationInfo.size() == 0){
            message = "FALSE^工站编码不在系统中,请先维护工站信息";
            message = "FALSE^工站编码:"+ stationId +"不在系统中,请先维护工站信息";
            return message;
        }
       //检查工站
        message += "^"+ stationId;
        return message;
    }
    public String checkStationIsUsed(StaAssemblyWorkLast last){
    public String checkStationUsed(QueryVo last){
        String message = "OK";
        Long userId = null;
        Long stationId = null;
@@ -100,7 +105,7 @@
        String stationMsg = checkStation(last.getStationId());
        if(userMsg.startsWith("FALSE") || stationMsg.startsWith("FALSE")){
            if(userMsg.startsWith("FALSE") && stationMsg.startsWith("FALSE")){
                message = userMsg +","+ stationMsg.split("^")[1];
                message = userMsg +","+ stationMsg.split("\\^")[1];
            }else if(userMsg.startsWith("FALSE")){
                message = userMsg;
            }else if(stationMsg.startsWith("FALSE")){
@@ -109,23 +114,22 @@
            return message;
        }else{//根据结果 找到对应的ID值
            if(userMsg.startsWith("USER")){
                userId =  Long.parseLong(userMsg.split("^")[1]);
                userId =  Long.parseLong(userMsg.split("\\^")[1]);
            }else if(userMsg.startsWith("STATION")){
                stationId = Long.parseLong(userMsg.split("^")[1]);
                stationId = Long.parseLong(userMsg.split("\\^")[1]);
            }
            if(stationMsg.startsWith("USER")){
                userId =  Long.parseLong(stationMsg.split("^")[1]);
                userId =  Long.parseLong(stationMsg.split("\\^")[1]);
            }else if(stationMsg.startsWith("STATION")){
                stationId = Long.parseLong(stationMsg.split("^")[1]);
                stationId = Long.parseLong(stationMsg.split("\\^")[1]);
            }
        }
        if(userId == null || stationId == null){
            message = "FALSE^员工编码:"+ last.getUserId() + "或工站编码:" + last.getStationId() + "不正确,请检查";
            return message;
        }
        //检查表中是不是已经存在
        //检查表中stationId是否已经存在
        StaAssemblyWorkLast param = new StaAssemblyWorkLast();
        param.setUserId(userId);
        param.setStationId(stationId);
        param.setStatus(1);
        List<StaAssemblyWorkLast> userStationList = assemblyWorkLastDao.selectList(param);