diff --git a/src/main/java/com/glxp/api/dao/inv/InnerOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InnerOrderDetailDao.java index 50d80f80d..906b3e3c2 100644 --- a/src/main/java/com/glxp/api/dao/inv/InnerOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InnerOrderDetailDao.java @@ -23,4 +23,6 @@ public interface InnerOrderDetailDao { List selectOrderList(@Param("orderIdFk") String orderIdFk); + List selectOrderDetailList(@Param("orderIdFk") String orderIdFk,@Param("productId") String productId,@Param("batchNo") String batchNo); + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java index edfebd2ba..8f6e8681e 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java @@ -6,6 +6,7 @@ import com.glxp.api.entity.inv.InnerOrderDetailEntity; import com.glxp.api.req.inv.InnerOrderDetailRequest; import com.glxp.api.res.inv.innerOrderDetailResponse; import com.glxp.api.service.inv.InnerOrderDetailService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,7 +35,13 @@ public class InnerOrderDetailServiceImpl implements InnerOrderDetailService { @Override public Boolean insert(InnerOrderDetailEntity innerOrderDetailEntity) { - return innerOrderDetailDao.insert(innerOrderDetailEntity); + List innerOrderDetailEntityList=innerOrderDetailDao.selectOrderDetailList(innerOrderDetailEntity.getOrderIdFk(),innerOrderDetailEntity.getProductId(),innerOrderDetailEntity.getBatchNo()); + if(CollectionUtils.isEmpty(innerOrderDetailEntityList)){ + return innerOrderDetailDao.insert(innerOrderDetailEntity); + }else{ + return innerOrderDetailDao.update(innerOrderDetailEntity); + } + } @Override diff --git a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml index c5b275b8c..49b2490c1 100644 --- a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml @@ -92,4 +92,23 @@ + + \ No newline at end of file