diff --git a/src/main/java/com/spring/modules/rohs/controller/RohsController.java b/src/main/java/com/spring/modules/rohs/controller/RohsController.java index ee0ea50a..7453e4c2 100644 --- a/src/main/java/com/spring/modules/rohs/controller/RohsController.java +++ b/src/main/java/com/spring/modules/rohs/controller/RohsController.java @@ -134,14 +134,6 @@ public class RohsController { if (StringUtils.isBlank(rohs.getRejectFlag())) { rohs.setRejectFlag("N"); } - if (rohs.getMaterialList() != null) { - if (!rohs.getMaterialList().isEmpty()) { - rohs.setIfsPartNo(rohs.getMaterialList().get(0).getTestPartNo()); - } else { - rohs.setIfsPartNo(null); - } - } - rohsService.save(rohs); rohsService.saveOrUpdateMaterials(rohs); return R.ok().put("referenceNo", newReferenceNo); @@ -174,13 +166,6 @@ public class RohsController { QueryWrapper updateWrapper = new QueryWrapper<>(); updateWrapper.eq("site", rohs.getSite()).eq("reference_no", rohs.getReferenceNo()); - if (rohs.getMaterialList() != null) { - if (!rohs.getMaterialList().isEmpty()) { - rohs.setIfsPartNo(rohs.getMaterialList().get(0).getTestPartNo()); - } else { - rohs.setIfsPartNo(null); - } - } rohsService.update(rohs, updateWrapper); rohsService.saveOrUpdateMaterials(rohs); return R.ok(); @@ -207,11 +192,6 @@ public class RohsController { rohsService.saveOrUpdateMaterials(rohs); RohsEntity updateEntity = new RohsEntity(); - if (rohs.getMaterialList() != null && !rohs.getMaterialList().isEmpty()) { - updateEntity.setIfsPartNo(rohs.getMaterialList().get(0).getTestPartNo()); - } else { - updateEntity.setIfsPartNo(null); - } updateEntity.setUpdateDate(new Date()); updateEntity.setUpdateBy(currentUserName); QueryWrapper updateWrapper = new QueryWrapper<>(); @@ -224,7 +204,6 @@ public class RohsController { * 下达 */ @PostMapping("/issue") - @Transactional public R issue(@RequestBody RohsSubmitVo data) { if (StringUtils.isBlank(data.getSite()) || StringUtils.isBlank(data.getReferenceNo()) || StringUtils.isBlank(data.getMenuId())) { return R.error("工厂(site)、序列号(referenceNo)和菜单ID(menuId)不能为空"); @@ -243,7 +222,6 @@ public class RohsController { * 审批提交(同意/驳回) */ @PostMapping("/submit") - @Transactional public R submit(@RequestBody RohsSubmitVo data) { if (StringUtils.isBlank(data.getSite()) || StringUtils.isBlank(data.getReferenceNo())) { return R.error("工厂(site)和序列号(referenceNo)不能为空"); diff --git a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java index ed2302c4..4af3e259 100644 --- a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java +++ b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java @@ -233,14 +233,6 @@ public class RohsServiceImpl extends ServiceImpl impleme updateEntity.setCreateBy(null); updateEntity.setUpdateDate(new Date()); updateEntity.setUpdateBy(userName); - // ifsPartNo 与材料保持一致 - if (data.getMaterialList() != null) { - if (data.getMaterialList().isEmpty()) { - updateEntity.setIfsPartNo(null); - } else { - updateEntity.setIfsPartNo(data.getMaterialList().get(0).getTestPartNo()); - } - } QueryWrapper updateWrapper = new QueryWrapper<>(); updateWrapper.eq("site", site).eq("reference_no", referenceNo); this.update(updateEntity, updateWrapper); diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index a02fc818..ac1b36ba 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -1678,7 +1678,6 @@ update plm_change_item set execute_flag = 'N', - executor = '', item_execution_date = null where site = #{site} and change_no = #{changeNo} @@ -1686,7 +1685,6 @@ update plm_change_countersignature_item set execute_flag = 'N', - executor = '', item_execution_date = null where site = #{site} and change_no = #{changeNo}