diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InspectGoodsDetailMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InspectGoodsDetailMapper.java index 49c153b..8f17274 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InspectGoodsDetailMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InspectGoodsDetailMapper.java @@ -59,4 +59,6 @@ public interface InspectGoodsDetailMapper { public int deleteInspectGoodsDetailByInspectGoodsDetailIds(Long[] inspectGoodsDetailIds); public int deleteInspectGoodsDetailByInspectGoodsId(Long inspectGoodsId); + + public int deleteInspectGoodsDetailByInspectGoodsIds(Long[] inspectGoodsIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/OrderGoodsDetailMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/OrderGoodsDetailMapper.java index 7207306..1686f44 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/OrderGoodsDetailMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/OrderGoodsDetailMapper.java @@ -59,4 +59,6 @@ public interface OrderGoodsDetailMapper { public int deleteOrderGoodsDetailByOrderGoodsDetailIds(Long[] orderGoodsDetailIds); public int deleteOrderGoodsDetailByOrderGoodsId(Long orderGoodsId); + + public int deleteOrderGoodsDetailByOrderGoodsIds(Long[] orderGoodsIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchasePlanDetailMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchasePlanDetailMapper.java index 6dda92c..9e8d71e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchasePlanDetailMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchasePlanDetailMapper.java @@ -59,4 +59,6 @@ public interface PurchasePlanDetailMapper { public int deletePurchasePlanDetailByDetailIds(Long[] detailIds); public int deletePurchasePlanDetailByPlanId(Long planId); + + public int deletePurchasePlanDetailByPlanIds(Long[] planIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IInspectGoodsDetailService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IInspectGoodsDetailService.java index f04fc05..962fb4e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IInspectGoodsDetailService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IInspectGoodsDetailService.java @@ -59,4 +59,6 @@ public interface IInspectGoodsDetailService { public int deleteInspectGoodsDetailByInspectGoodsDetailId(Long inspectGoodsDetailId); public int deleteInspectGoodsDetailByInspectGoodsId(Long inspectGoodsId); + + public int deleteInspectGoodsDetailByInspectGoodsIds(Long[] inspectGoodsIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IOrderGoodsDetailService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IOrderGoodsDetailService.java index 8d7d0ae..9655dd5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IOrderGoodsDetailService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IOrderGoodsDetailService.java @@ -59,4 +59,7 @@ public interface IOrderGoodsDetailService { public int deleteOrderGoodsDetailByOrderGoodsDetailId(Long orderGoodsDetailId); public int deleteOrderGoodsDetailByOrderGoodsId(Long orderGoodsId); + + public int deleteOrderGoodsDetailByOrderGoodsIds(Long[] orderGoodsId); + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IPurchasePlanDetailService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IPurchasePlanDetailService.java index 6bf8739..19c0f51 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IPurchasePlanDetailService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IPurchasePlanDetailService.java @@ -59,4 +59,6 @@ public interface IPurchasePlanDetailService { public int deletePurchasePlanDetailByDetailId(Long detailId); public int deletePurchasePlanDetailByPlanId(Long planId); + + public int deletePurchasePlanDetailByPlanIds(Long[] planIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsDetailServiceImpl.java index 1cc82ce..7a5e180 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsDetailServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsDetailServiceImpl.java @@ -100,4 +100,9 @@ public class InspectGoodsDetailServiceImpl implements IInspectGoodsDetailService public int deleteInspectGoodsDetailByInspectGoodsId(Long inspectGoodsId) { return inspectGoodsDetailMapper.deleteInspectGoodsDetailByInspectGoodsId(inspectGoodsId); } + + @Override + public int deleteInspectGoodsDetailByInspectGoodsIds(Long[] inspectGoodsIds) { + return inspectGoodsDetailMapper.deleteInspectGoodsDetailByInspectGoodsIds(inspectGoodsIds); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java index d7fb026..81bbdad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java @@ -151,7 +151,9 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService { * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deleteInspectGoodsByInspectGoodsIds(Long[] inspectGoodsIds) { + inspectGoodsDetailService.deleteInspectGoodsDetailByInspectGoodsIds(inspectGoodsIds); return inspectGoodsMapper.deleteInspectGoodsByInspectGoodsIds(inspectGoodsIds); } @@ -162,7 +164,9 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService { * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deleteInspectGoodsByInspectGoodsId(Long inspectGoodsId) { + inspectGoodsDetailService.deleteInspectGoodsDetailByInspectGoodsId(inspectGoodsId); return inspectGoodsMapper.deleteInspectGoodsByInspectGoodsId(inspectGoodsId); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsDetailServiceImpl.java index f7ec92f..1835ce4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsDetailServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsDetailServiceImpl.java @@ -100,4 +100,9 @@ public class OrderGoodsDetailServiceImpl implements IOrderGoodsDetailService { public int deleteOrderGoodsDetailByOrderGoodsId(Long orderGoodsId) { return orderGoodsDetailMapper.deleteOrderGoodsDetailByOrderGoodsId(orderGoodsId); } + + @Override + public int deleteOrderGoodsDetailByOrderGoodsIds(Long[] orderGoodsIds) { + return orderGoodsDetailMapper.deleteOrderGoodsDetailByOrderGoodsIds(orderGoodsIds); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java index f4823e3..118e852 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java @@ -150,7 +150,9 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService { * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deleteOrderGoodsByOrderGoodsIds(Long[] orderGoodsIds) { + inspectGoodsDetailService.deleteOrderGoodsDetailByOrderGoodsIds(orderGoodsIds); return orderGoodsMapper.deleteOrderGoodsByOrderGoodsIds(orderGoodsIds); } @@ -161,7 +163,9 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService { * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deleteOrderGoodsByOrderGoodsId(Long orderGoodsId) { + inspectGoodsDetailService.deleteOrderGoodsDetailByOrderGoodsId(orderGoodsId); return orderGoodsMapper.deleteOrderGoodsByOrderGoodsId(orderGoodsId); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java index 44353cb..9d0fb80 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java @@ -184,7 +184,9 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService { * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deletePurchaseContractByContractId(Long contractId) { + inspectGoodsDetailService.deletePurchaseContractDetailByContractId(contractId); return purchaseContractMapper.deletePurchaseContractByContractId(contractId); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanDetailServiceImpl.java index e23935b..3724d76 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanDetailServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanDetailServiceImpl.java @@ -100,4 +100,9 @@ public class PurchasePlanDetailServiceImpl implements IPurchasePlanDetailService public int deletePurchasePlanDetailByPlanId(Long planId) { return purchasePlanDetailMapper.deletePurchasePlanDetailByPlanId(planId); } + + @Override + public int deletePurchasePlanDetailByPlanIds(Long[] planIds) { + return purchasePlanDetailMapper.deletePurchasePlanDetailByPlanIds(planIds); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java index 9300940..ca45340 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java @@ -182,7 +182,9 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService { * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deletePurchasePlanByPlanIds(Long[] planIds) { + inspectGoodsDetailService.deletePurchasePlanDetailByPlanIds(planIds); return purchasePlanMapper.deletePurchasePlanByPlanIds(planIds); } @@ -193,7 +195,9 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService { * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int deletePurchasePlanByPlanId(Long planId) { + inspectGoodsDetailService.deletePurchasePlanDetailByPlanId(planId); return purchasePlanMapper.deletePurchasePlanByPlanId(planId); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsDetailMapper.xml index 5cf89a2..1c3e65b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsDetailMapper.xml @@ -122,6 +122,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from ims_inspect_goods_detail where inspect_goods_id = #{inspectGoodsId} + + delete from ims_inspect_goods_detail where inspect_goods_id in + + #{inspectGoodsId} + + + delete from ims_inspect_goods_detail where inspect_goods_detail_id in diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml index e65a6cd..7975ca1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml @@ -133,6 +133,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ims_order_goods_detail set del_flag = '2' where order_goods_id = #{orderGoodsId} + + update ims_order_goods_detail set del_flag = '2' where order_goods_id in + + #{orderGoodsId} + + + update ims_order_goods_detail set del_flag = '2' where order_goods_detail_id in diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractDetailMapper.xml index e0df79d..297580d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractDetailMapper.xml @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ims_purchase_contract_detail set del_flag = '2' where contract_id = #{contractId} - + update ims_purchase_contract_detail set del_flag = '2' where contract_id in #{contractId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanDetailMapper.xml index 32844cd..011f4cd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanDetailMapper.xml @@ -140,6 +140,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ims_purchase_plan_detail set del_flag = '2' where plan_id = #{planId} + + update ims_purchase_plan_detail set del_flag = '2' where plan_id in + + #{planId} + + + update ims_purchase_plan_detail set del_flag = '2' where detail_id in