blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-07-16 03df078310b88f2b4472c07ed9a09278b425ee00 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java


@@ -5,14 +5,12 @@


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;


import com.example.erp.common.Constants;


import com.example.erp.entity.pp.DamageDetails;


import com.example.erp.entity.pp.FlowCard;


import com.example.erp.entity.pp.ReportingWork;


import com.example.erp.entity.pp.ReportingWorkDetail;


import com.example.erp.entity.sd.Order;


import com.example.erp.entity.sd.OrderDetail;


import com.example.erp.entity.sd.OrderProcessDetail;


import com.example.erp.exception.ServiceException;


import com.example.erp.mapper.pp.*;


@@ -20,7 +18,6 @@


import com.example.erp.mapper.sd.OrderMapper;


import com.example.erp.mapper.sd.OrderProcessDetailMapper;


import com.example.erp.service.sd.OrderProcessDetailService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




@@ -66,7 +63,7 @@


    public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {


        Map<String, Object> map = new HashMap<>();


        //查询流程卡工艺流程


        String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr);


        String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr);








@@ -101,6 +98,9 @@


                break;


            }


        }




        //工艺流程


        map.put("technologicalProcess", technologicalProcess);




        //设备下拉框


        map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));


@@ -200,11 +200,18 @@


                });


            }


            //查询流程卡工艺流程


            String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId());


            String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());




            int index = technologicalProcess.indexOf("-");


            //获取工艺流程第一个工序


            String interceptProcess = technologicalProcess.substring(0, index);


            String interceptProcess = "";


            if (index <0){


                 interceptProcess = technologicalProcess;


            }


            else {


                //获取工艺流程第一个工序


                 interceptProcess = technologicalProcess.substring(0, index);


            }






            //判断当前工序是否为第一道工序工序，使用流程卡表数量或者小片流程表上工序数量


            int processNum = 0;