| | |
|---|
| | | public Map<String, Object> SelectProcessSv(String userId) { |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | String process = reportingWorkMapper.selectUserProcess(userId); |
|---|
| | | //工序列表 |
|---|
| | | List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList(); |
|---|
| | | if (process==null) { |
|---|
| | | map.put("process", reportingWorkMapper.SelectProcessMp()); |
|---|
| | | } |
|---|
| | |
|---|
| | | map.put("process",reportingWorkMapper.getSelectProcessDuoqu() ); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | map.put("processNameList", processNameList); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | //获取报工工序是否为复合工程 |
|---|
| | | String laminating = reportingWorkMapper.getProcessLaminating(thisProcess); |
|---|
| | | //合片工序 |
|---|
| | | if (laminating.equals("stepA") || laminating.equals("stepB")){ |
|---|
| | | if (laminating.indexOf("step")!=-1){ |
|---|
| | | LambdaUpdateWrapper |
|---|
| | | <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>(); |
|---|
| | | updateWrapper |
|---|
| | |
|---|
| | | Map<String, Object> result = new HashMap<>(); |
|---|
| | | BasicData basicData = basicDataMapper |
|---|
| | | .selectOne(new QueryWrapper<BasicData>().eq("basic_name", reportingWork.get("process"))); |
|---|
| | | result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData.getNickname())); |
|---|
| | | result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData==null?null:basicData.getNickname())); |
|---|
| | | result.put("date",date); |
|---|
| | | return result; |
|---|
| | | } |
|---|
