| | |
|---|
| | | import com.example.erp.mapper.userInfo.LogMapper; |
|---|
| | | import com.example.erp.service.sd.OrderProcessDetailService; |
|---|
| | | import com.example.erp.service.userInfo.LogService; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.stereotype.Service; |
|---|
| | | import org.springframework.transaction.annotation.Transactional; |
|---|
| | | |
|---|
| | |
|---|
| | | this.orderGlassDetailMapper = orderGlassDetailMapper; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) { |
|---|
| | | public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process, String reportType) { |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | //查询流程卡工艺流程 |
|---|
| | | String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr); |
|---|
| | |
|---|
| | | nextProcess = processList[i + 1]; |
|---|
| | | } |
|---|
| | | //查询当前工序的表头数据 |
|---|
| | | map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr, previousProcess, nextProcess, process)); |
|---|
| | | map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr, previousProcess, nextProcess, process,reportType)); |
|---|
| | | map.put("thisProcess", processList); |
|---|
| | | break; |
|---|
| | | } |
|---|
| | |
|---|
| | | //判断本工序是不是第一道工序 |
|---|
| | | if (interceptProcess.equals(process)) { |
|---|
| | | //是第一道工序，查询流程卡数据 |
|---|
| | | map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process)); |
|---|
| | | map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType)); |
|---|
| | | } else { |
|---|
| | | //不是第一道工序，查询报工数据 |
|---|
| | | List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process); |
|---|
