diff --git a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java index 9c10979..35b8531 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java +++ b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java @@ -182,4 +182,6 @@ public interface IssureNotifyMapper extends BaseMapper { * @return 替代料列表 */ List getBomAlternativeParts(BomAlternativePartsData data); + + void deleteNotifyMaterial2(SOIssueNotifyOrderMaterialListData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index 29902d8..81caae1 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -253,31 +253,31 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { @Transactional public void deleteNotifyMaterial(SOIssueNotifyOrderMaterialListData data){ List checkDeleteMaterial=issureNotifyMapper.checkDeleteMaterial(data); - if(checkDeleteMaterial.size()==0){ + if(checkDeleteMaterial.isEmpty()){ throw new RuntimeException("该记录已不存在!"); } if(BigDecimalUtils.compareToZero(checkDeleteMaterial.get(0).getQtyToIssueOriginal())>0){ throw new RuntimeException("该记录已有领料记录无法删除!"); } - issureNotifyMapper.deleteNotifyMaterial(data); - - IssueNotifyChangeLog issueNotifyChangeLog=new IssueNotifyChangeLog(); - List checkList=issureNotifyMapper.getSOIssueNotifyOrderListData(data); - if(checkList.size()>0){ - issueNotifyChangeLog.setsOOrderNo(checkList.get(0).getsOOrderNo()); - issueNotifyChangeLog.setSeqNo(checkList.get(0).getSeqNo()); - - } - issueNotifyChangeLog.setSite(data.getSite()); - issueNotifyChangeLog.setNotifyNo(data.getNotifyNo()); - issueNotifyChangeLog.setItemNo(data.getItemNo()); - issueNotifyChangeLog.setComponentPartNo(data.getComponentPartNo()); - issueNotifyChangeLog.setQtyToIssue(data.getQtyToIssue()); - issueNotifyChangeLog.setUpdateBy(String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername())); - issueNotifyChangeLog.setUpdateType("删除申请单材料明细"); - issueNotifyChangeLog.setUpdateDate(new Date()); - issueNotifyChangeLog.setIssueType(data.getIssueType()); - issureNotifyMapper.saveIssueNotifyChangeLog(issueNotifyChangeLog); + issureNotifyMapper.deleteNotifyMaterial2(data); + +// IssueNotifyChangeLog issueNotifyChangeLog=new IssueNotifyChangeLog(); +// List checkList=issureNotifyMapper.getSOIssueNotifyOrderListData(data); +// if(!checkList.isEmpty()){ +// issueNotifyChangeLog.setsOOrderNo(checkList.get(0).getsOOrderNo()); +// issueNotifyChangeLog.setSeqNo(checkList.get(0).getSeqNo()); +// +// } +// issueNotifyChangeLog.setSite(data.getSite()); +// issueNotifyChangeLog.setNotifyNo(data.getNotifyNo()); +// issueNotifyChangeLog.setItemNo(data.getItemNo()); +// issueNotifyChangeLog.setComponentPartNo(data.getComponentPartNo()); +// issueNotifyChangeLog.setQtyToIssue(data.getQtyToIssue()); +// issueNotifyChangeLog.setUpdateBy(String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername())); +// issueNotifyChangeLog.setUpdateType("删除申请单材料明细"); +// issueNotifyChangeLog.setUpdateDate(new Date()); +// issueNotifyChangeLog.setIssueType(data.getIssueType()); +// issureNotifyMapper.saveIssueNotifyChangeLog(issueNotifyChangeLog); } @Override @Transactional diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index d905d6c..17e9262 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -442,9 +442,17 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) and ItemNo=#{itemNo} + + + delete from SOIssueNotifyOrderMaterialList + where Site=#{site} and NotifyNo=#{notifyNo} + and BOMItemNo=#{bOMItemNo} + + insert into IssueNotifyChangeLog (Site,NotifyNo,ItemNo,SOOrderNo,SeqNo,ComponentPartNo,QtyToIssue,updateType,updateBy,updateDate,issueType) values (#{site},#{notifyNo},#{itemNo},#{sOOrderNo},#{seqNo},#{componentPartNo},#{qtyToIssue,jdbcType=DOUBLE},#{updateType},#{updateBy},#{updateDate},#{issueType})