-切换大模组代码更改

admin

2024-07-09 4e83fa344f6cba81412fb354e7f32a88a8f34fde

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -7,6 +7,8 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jcdm.main.constant.Constants;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -39,15 +41,51 @@
    @Autowired
    private IBsFormulaChildInfoService bsFormulaChildInfoService;

    @Autowired
    private MiloService miloService;

    /**
     * 扫码确认
     */
    @GetMapping("/fistSetpNumber")
    public AjaxResult fistSetpNumber(BsFormulaChildInfo bsFormulaChildInfo)
    {
//        try {
//            String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
//            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(1).build());
//        } catch (Exception e) {
//            throw new RuntimeException(e);
//        }
        Integer stepNumber = 1;
        try {
            List<BsFormulaChildInfo> op260 = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode()));
            List<BsFormulaChildInfo> filteredList = op260.stream()
                    .filter(obj -> obj.getResults() != null && !obj.getResults().isEmpty())
                    .collect(Collectors.toList());
            if(filteredList.size() > 0){
                stepNumber = Integer.valueOf(filteredList.get(filteredList.size()-1).getStepSort())+1;
            }

            String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(stepNumber).build());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        return AjaxResult.success(stepNumber);
    }

    /**
     * 查询配方配置子信息列表
     */
    @GetMapping("/noPageListFormulaChild")
    public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
    {

        List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
                .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
                .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode()));
                .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
//                .orderByAsc(BsFormulaChildInfo::getStepSort)
        );
        if (CollUtil.isNotEmpty(list)){
            List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());
            List<BsFormulaChildInfo> collect2 = list.stream().filter(x -> !Constants.OK.equals(x.getResults())).collect(Collectors.toList());
@@ -142,6 +180,33 @@
    }

    /**
     * 放行请空状态
     */
    @GetMapping("/checkMaterialCode")
    public AjaxResult checkMaterialCode(BsFormulaChildInfo bsFormulaChildInfo)
    {
        return bsFormulaChildInfoService.checkMaterialCode(bsFormulaChildInfo);
    }

    /**
     * 放行请空状态
     */
    @GetMapping("/clearWorkpieceRelease")
    public AjaxResult clearWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo)
    {
        return bsFormulaChildInfoService.clearWorkpieceRelease(bsFormulaChildInfo);
    }

    /**
     * 放行请空状态
     */
    @GetMapping("/jrmWorkpieceRelease")
    public AjaxResult jrmWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo)
    {
        return bsFormulaChildInfoService.jrmWorkpieceRelease(bsFormulaChildInfo);
    }

    /**
     * 拧紧后更新对应数据
     */
    @GetMapping("/updateTighteningFormula")