lineName change

Fancy

2024-07-19 1d27648989e69042db607d14c474d9ea90f86d7b

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java

@@ -15,6 +15,7 @@
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.*;
import com.dy.pmsGlobal.util.DeviceResult;
import com.dy.pmsGlobal.util.DeviceStatus;
import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
@@ -216,6 +217,7 @@
        if (preRecord != null) {
            record.id = preRecord.id;
            record.inTime = preRecord.outTime;
            record.outLineTime = preRecord.outLineTime;//下边判断是否结束会用到 得留着
        } else {
            record.inTime = new Date();
            record.inLineTime = new Date();
@@ -233,6 +235,7 @@
        record.assistants = workLast.assistants;
        record.errorMsg = params.errorMsg;

        Boolean isEnd = false;//是否经历过结束节点
        PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
        record.nodeContent = node.content;
        if (node.isRecord) {
@@ -241,12 +244,14 @@
        if (node.getIsEnd() && record.outLineTime == null) {
            record.outLineTime = new Date();
            assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
            isEnd = true;
        }else if(record.outLineTime != null){
            isEnd = true;
        }
        assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
        record.status = getStatus(params.status, node.isEnd, workLast.workType.toString());
        if (record.status == null) {
            record.status = preRecord.status;
        }

        record.status = getStatus(params.status, isEnd, workLast.workType.toString());
        record.result = getResult(params.status, workLast.workType.toString());
        return record;
    }

@@ -265,33 +270,61 @@
    }

    /**
     * 状态: 0:待生产,1:组装中,2:完成,3:维修,4:报废,5:测试不通过,6:品检不通过
     *
     * 原状态: 0:待生产,1:组装中,2:完成,3:维修,4:报废,5:测试不通过,6:品检不通过
     *20240717当前状态  状态: 1, 组装中,2:完成,3:维修,4:报废
     * @param status    状态
     * @param isEndNode 是否结束节点
     * @param isEnd 是否经历过结束节点
     * @return 状态
     */
    private Integer getStatus(String status, boolean isEndNode, String workType) {
        //组装,维修
        if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_REPAIR.equals(workType)) {
    private Integer getStatus(String status, boolean isEnd, String workType) {
        //组装   2024/07/17 目前组装workType 1 只有MarkOk     //测试    //品检
        if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_TEST.equals(workType) || WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_REPAIR.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> isEndNode ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
                case QrCodeConstant.MarkUnqualified, QrCodeConstant.MarkPreUnqualified -> DeviceStatus.REPAIR.getCode();
                case QrCodeConstant.MarkOk -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceStatus.REPAIR.getCode();
                case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //品检,测试
        } else if (WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_TEST.equals(workType)) {
        }
        //维修
        throw new RuntimeException("状态错误，无效的节点类型: " + workType);
    }
    /**
     * 结果: 1:通过,2:测试通过,3:品检通过,4:维修通过,5:测试不通过,6:品检不通过,7:报废
     * @param status    前端出来的状态
     * @return 结果
     */
    private Integer getResult(String status, String workType) {
        //组装
        if (WORK_TYPE_ASSEMBLY.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> null;//DeviceStatus.COMPLETED.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceStatus.TEST_FAILED.getCode();
                case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
                case QrCodeConstant.MarkOk -> DeviceResult.PASS.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //测试
        }else if (WORK_TYPE_TEST.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceResult.TEST_PASS.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceResult.TEST_FAIL.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //品检
        }else if (WORK_TYPE_INSPECTION.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceResult.INSPECTION_PASS.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceResult.INSPECTION_FAIL.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //维修
        }else if (WORK_TYPE_REPAIR.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceResult.REPAIR_PASS.getCode();
                case QrCodeConstant.MarkWaste -> DeviceResult.WASTE.getCode();
                default -> throw new RuntimeException("状态错误");
            };
        }
        throw new RuntimeException("状态错误，无效的节点类型: " + workType);
    }

    public int repair(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
@@ -452,6 +485,7 @@
        map.put("proName", "");
        map.put("proType", "");
        map.put("proId", "");
        map.put("proCode", "");
        //判断是不是是本厂物料
        if(CollectionUtils.isEmpty(productList)){
            productList = productDao.selectAll(null);
@@ -466,10 +500,41 @@
            map.put("proType", product.getType());
            BigInteger proId = BigInteger.valueOf(product.getId());
            map.put("proId", proId.toString());
            map.put("proCode",product.getCode());
        }
        return map;
    }

   /* public PrAssemblyPlan queryPlanByDeviceNo(String deviceNo) {
        String proCode = "";
        String lotCode = "";
        if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
            proCode = deviceNo.substring(3,6);
            lotCode = deviceNo.substring(6,15);
        }
        Map<String, String> map = new HashMap<>();
        map.put("deviceNo", deviceNo);
        map.put("proName", "");
        map.put("proType", "");
        map.put("proId", "");
        map.put("proCode", "");
        //判断是不是是本厂物料
        if(CollectionUtils.isEmpty(productList)){
            productList = productDao.selectAll(null);
        }
        PltProduct product = null;

        if (product != null) {
            map.put("deviceNo", deviceNo);
            map.put("proName", product.getName());
            map.put("proType", product.getType());
            BigInteger proId = BigInteger.valueOf(product.getId());
            map.put("proId", proId.toString());
            map.put("proCode",product.getCode());
        }
        return map;
    }
*/
    public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
        return deviceLifeDao.selectByDeviceNo(deviceNo);
    }