| | |
|---|
| | | import com.baomidou.dynamic.datasource.annotation.DS; |
|---|
| | | import com.example.erp.entity.pp.BasicDataProduce; |
|---|
| | | import com.example.erp.entity.pp.FlowCard; |
|---|
| | | import com.example.erp.entity.pp.PatchLog; |
|---|
| | | import com.example.erp.entity.pp.Rework; |
|---|
| | | import com.example.erp.entity.userInfo.Log; |
|---|
| | | import com.example.erp.entity.userInfo.SysError; |
|---|
| | |
|---|
| | | for (Map<String, Object> item : ReworkMap) { |
|---|
| | | item.put("reworkTeam", ""); |
|---|
| | | List<BasicDataProduce> basicCategory = new ArrayList<>(); |
|---|
| | | |
|---|
| | | List<BasicDataProduce> basicDataProduceList = basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString()); |
|---|
| | | for (BasicDataProduce basicDataProduce : basicDataProduceList) { |
|---|
| | | if (Objects.equals(basicDataProduce.getBasicData().getBasicName(), item.get("reworkProcesses"))) { |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | //保存日志 |
|---|
| | | Log log = new Log(); |
|---|
| | | log.setContent(object.toString()); |
|---|
| | | log.setFunction("updateRework返工审核"); |
|---|
| | | log.setOperatorId((String) object.get("userId")); |
|---|
| | | log.setOperator((String) object.get("userName")); |
|---|
| | | logService.saveLog(log); |
|---|
| | | return saveState; |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | map.put("type", flowCardMapper.selectType()); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Boolean deleteReworkSv(Map<String, Object> object) { |
|---|
| | | boolean saveState = true; |
|---|
| | | Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); |
|---|
| | | try { |
|---|
| | | System.out.println(111111); |
|---|
| | | //获取对象集合循环进行新增修改 |
|---|
| | | List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class); |
|---|
| | | if (!reworklist.isEmpty()){ |
|---|
| | | for (Rework rework : reworklist) { |
|---|
| | | //删除返工表对应补片id数据 |
|---|
| | | reworkMapper.deleteReworkMp(rework.getReworkId()); |
|---|
| | | //修改次破明细表补片数量和状态 |
|---|
| | | reworkMapper.updateReworkDdMp(rework.getReportingWorkId(),rework.getOrderSort(),rework.getTechnologyNumber(),rework.getReworkNum()); |
|---|
| | | //修改报工明细表状态 |
|---|
| | | reworkMapper.updateReworkBgMp(rework.getReportingWorkId(),rework.getOrderSort(),rework.getTechnologyNumber()); |
|---|
| | | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | } catch (Exception e) { |
|---|
| | | TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); |
|---|
| | | //将异常传入数据库 |
|---|
| | | SysError sysError = new SysError(); |
|---|
| | | sysError.setError(e.toString()); |
|---|
| | | sysError.setFunc("saveOrder"); |
|---|
| | | sysErrorService.insert(sysError); |
|---|
| | | saveState = false; |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | return saveState; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
