Merge remote-tracking branch 'origin/master'

Fancy

2024-07-31 27c0c61e48bfb3e870d44b3b53a820568fcce5d5

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

@@ -41,8 +41,8 @@
    private static final String WORK_TYPE_INSPECTION = "3";
    private static final String WORK_TYPE_REPAIR = "4";

    private static final String USER_PREFIX = "101";
    private static final String STATION_PREFIX = "103";
//    private static final String USER_PREFIX = "101";
//    private static final String STATION_PREFIX = "103";

    private PrAssemblyPlanMapper assemblyDao;
    private BaUserMapper baUserDao;
@@ -99,7 +99,7 @@
            throw new RuntimeException("员工编码不能为空");
        }
        //用户101
        if (id.startsWith(USER_PREFIX)) {
        if (id.startsWith(QrCodeConstant.TypeWorker)) {
            userId = Long.parseLong(id.toString().substring(3));
        } else {
            userId = Long.parseLong(id.toString());
@@ -120,7 +120,7 @@
            throw new RuntimeException("工站编码不能为空");
        }
        //工站103
        if (id.startsWith(STATION_PREFIX)) {
        if (id.startsWith(QrCodeConstant.TypeStation)) {
            stationId = Long.parseLong(id.toString().substring(3));
        } else {
            stationId = Long.parseLong(id.toString());
@@ -149,12 +149,12 @@
            throw new RuntimeException("工站编码或员工编码均不能为空,请检查");
        }
        //工站103
        if (vo.getStationId().startsWith(USER_PREFIX)) {
        if (vo.getStationId().startsWith(QrCodeConstant.TypeWorker)) {
            userInfo = getUserInfo(vo.getStationId());
        } else {
            stationInfo = getStationInfo(vo.getStationId());
        }
        if (vo.getUserId().startsWith(STATION_PREFIX)) {
        if (vo.getUserId().startsWith(QrCodeConstant.TypeStation)) {
            stationInfo = getStationInfo(vo.getUserId());
        } else {
            userInfo = getUserInfo(vo.getUserId());
@@ -412,7 +412,7 @@
        if (workLast == null) {
            throw new RuntimeException("系统中没有当前登录信息,请检查或重新登录");
        }
        if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)) {
        if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(QrCodeConstant.TypeWorker)) {
            assistant = assistant.substring(3);
        }
        if (!StringUtils.isBlank(workLast.getAssistants())) {