发货，订单删除主表同时删除明细

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderParts.java

@@ -52,6 +52,11 @@ public class OrderParts implements Serializable {
 		@ApiModelProperty(value = "主表id")
 		private Long pid;
 	/**
+	 * 主订单表id
+	 */
+		@ApiModelProperty(value = "主订单表id")
+		private Long srcPid;
+	/**
 	* 商品id
 	*/
 		@ApiModelProperty(value = "商品id")

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -39,6 +39,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.deliver.goods.entity.DeliveryItems;
 import org.springblade.deliver.goods.enums.DeliveryEnum;
 import org.springblade.deliver.goods.enums.DeliveryStatusEnum;
+import org.springblade.deliver.goods.service.IDeliveryFeesService;
+import org.springblade.deliver.goods.service.IDeliveryFilesService;
 import org.springblade.deliver.goods.service.IDeliveryItemsService;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -68,7 +70,9 @@ public class DeliveryController extends BladeController {
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private IUserClient iUserClient;//获取用户信息
 	private IStorageClient iStorageClient;//库区信息
-	private final IDeliveryItemsService iDeliveryItemsService;
+	private final IDeliveryItemsService deliveryItemsService;
+	private final IDeliveryFeesService deliveryFeesService;
+	private final IDeliveryFilesService deliveryFilesService;
 	/**
 	 * 详情
 	 */
@@ -193,7 +197,11 @@ public class DeliveryController extends BladeController {
 			throw  new SecurityException("已发货不能删除");
 		}
 		delivery.setIsDeleted(1);
-		return R.status(deliveryService.updateById(delivery));
+		deliveryService.updateById(delivery);
+		deliveryFeesService.updateByPid(delivery.getId());
+		deliveryFilesService.updateByPid(delivery.getId());
+		deliveryItemsService.updateByPid(delivery.getId());
+		return R.success("操作成功");
 	}
 
 	/**

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFeesMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.deliver.goods.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.deliver.goods.entity.DeliveryFees;
 import org.springblade.deliver.goods.vo.DeliveryFeesVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,10 @@ public interface DeliveryFeesMapper extends BaseMapper<DeliveryFees> {
 	 */
 	List<DeliveryFeesVO> selectDeliveryFeesPage(IPage page, DeliveryFeesVO deliveryFees);
 
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
+
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFeesMapper.xml

@@ -32,5 +32,8 @@
     <select id="selectDeliveryFeesPage" resultMap="deliveryFeesResultMap">
         select * from business_delivery_fees where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_delivery_fees SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFilesMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.deliver.goods.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.deliver.goods.entity.DeliveryFiles;
 import org.springblade.deliver.goods.vo.DeliveryFilesVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,5 +39,10 @@ public interface DeliveryFilesMapper extends BaseMapper<DeliveryFiles> {
 	 * @return
 	 */
 	List<DeliveryFilesVO> selectDeliveryFilesPage(IPage page, DeliveryFilesVO deliveryFiles);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryFilesMapper.xml

@@ -24,5 +24,8 @@
     <select id="selectDeliveryFilesPage" resultMap="deliveryFilesResultMap">
         select * from business_delivery_files where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_delivery_files SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.deliver.goods.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.deliver.goods.entity.DeliveryItems;
 import org.springblade.deliver.goods.vo.DeliveryItemsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,5 +39,10 @@ public interface DeliveryItemsMapper extends BaseMapper<DeliveryItems> {
 	 * @return
 	 */
 	List<DeliveryItemsVO> selectDeliveryItemsPage(IPage page, DeliveryItemsVO deliveryItems);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -50,5 +50,8 @@
     <select id="selectDeliveryItemsPage" resultMap="deliveryItemsResultMap">
         select * from business_delivery_items where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_delivery_items SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/IDeliveryFeesService.java

@@ -38,4 +38,10 @@ public interface IDeliveryFeesService extends IService<DeliveryFees> {
 	 */
 	IPage<DeliveryFeesVO> selectDeliveryFeesPage(IPage<DeliveryFeesVO> page, DeliveryFeesVO deliveryFees);
 
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
+
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/IDeliveryFilesService.java

@@ -37,5 +37,10 @@ public interface IDeliveryFilesService extends IService<DeliveryFiles> {
 	 * @return
 	 */
 	IPage<DeliveryFilesVO> selectDeliveryFilesPage(IPage<DeliveryFilesVO> page, DeliveryFilesVO deliveryFiles);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/IDeliveryItemsService.java

@@ -37,5 +37,10 @@ public interface IDeliveryItemsService extends IService<DeliveryItems> {
 	 * @return
 	 */
 	IPage<DeliveryItemsVO> selectDeliveryItemsPage(IPage<DeliveryItemsVO> page, DeliveryItemsVO deliveryItems);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryFeesServiceImpl.java

@@ -53,6 +53,11 @@ public class DeliveryFeesServiceImpl extends ServiceImpl<DeliveryFeesMapper, Del
 		return page.setRecords(baseMapper.selectDeliveryFeesPage(page, deliveryFees));
 	}
 
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
+
 	/**
 	 * 保存发货费用信息
 	 * @param pId
@@ -106,4 +111,5 @@ public class DeliveryFeesServiceImpl extends ServiceImpl<DeliveryFeesMapper, Del
 		return deliveryFeesList;
 	}
 
+
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryFilesServiceImpl.java

@@ -64,5 +64,9 @@ public class DeliveryFilesServiceImpl extends ServiceImpl<DeliveryFilesMapper, D
 		}
 		return deliveryFilesList;
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -499,4 +499,8 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		}
 
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -36,7 +36,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.purchase.sales.entity.OrderItems;
-import org.springblade.purchase.sales.service.IOrderItemsService;
+import org.springblade.purchase.sales.service.*;
 import org.springblade.purchase.sales.vo.OrderItemsVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -44,7 +44,6 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.vo.OrderVO;
-import org.springblade.purchase.sales.service.IOrderService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.math.BigDecimal;
@@ -64,6 +63,11 @@ public class OrderController extends BladeController {
 
 	private final IOrderService orderService;
 	private final IOrderItemsService orderItemsService;
+	private final IOrderFeesService orderFeesService;
+	private final IOrderFilesService orderFilesService;
+	private final IOrderFreightService orderFreightService;
+	private final IOrderModifyService orderModifyService;
+	private final IOrderPartsService orderPartsService;
 	private final ICorpsDescClient corpsDescClient;//获取客户信息
 	private final IUserClient userClient;//获取用户信息
 
@@ -217,7 +221,14 @@ public class OrderController extends BladeController {
 		//是否生成账单
 		LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
 		order.setIsDeleted(1);
-		return R.status(orderService.updateById(order));
+		orderService.updateById(order);
+		orderItemsService.updateByPid(order.getId());
+		orderFeesService.updateByPid(order.getId());
+		orderFilesService.updateByPid(order.getId());
+		orderFreightService.updateByPid(order.getId());
+		orderModifyService.updateByPid(order.getId());
+		orderPartsService.updateByPid(order.getId());
+		return R.success("操作成功");
 	}
 	/**
 	 * 新增或修改 国内销售或采购订单表

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entrance/EntranceOrderController.java

@@ -23,8 +23,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderItems;
-import org.springblade.purchase.sales.service.IOrderItemsService;
-import org.springblade.purchase.sales.service.IOrderService;
+import org.springblade.purchase.sales.service.*;
 import org.springblade.purchase.sales.vo.OrderItemBillNoVO;
 import org.springblade.purchase.sales.vo.OrderItemsVO;
 import org.springblade.purchase.sales.vo.OrderVO;
@@ -54,6 +53,11 @@ public class EntranceOrderController extends BladeController {
 	private final ICorpsDescClient corpsDescClient;//获取客户信息
 	private final IUserClient userClient;//获取用户信息
 	private final IOrderItemsService orderItemsService;
+	private final IOrderFeesService orderFeesService;
+	private final IOrderFilesService orderFilesService;
+	private final IOrderFreightService orderFreightService;
+	private final IOrderModifyService orderModifyService;
+	private final IOrderPartsService orderPartsService;
 
 	/**
 	 * 详情
@@ -200,7 +204,14 @@ public class EntranceOrderController extends BladeController {
 		//是否生成账单
 		LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
 		order.setIsDeleted(1);
-		return R.status(orderService.updateById(order));
+		orderService.updateById(order);
+		orderItemsService.updateByPid(order.getId());
+		orderFeesService.updateByPid(order.getId());
+		orderFilesService.updateByPid(order.getId());
+		orderFreightService.updateByPid(order.getId());
+		orderModifyService.updateByPid(order.getId());
+		orderPartsService.updateByPid(order.getId());
+		return R.success("操作成功");
 	}
 	/**
 	 * 新增或修改 进口销售或采购订单表

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportEnquiryController.java

@@ -20,8 +20,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderItems;
-import org.springblade.purchase.sales.service.IOrderItemsService;
-import org.springblade.purchase.sales.service.IOrderService;
+import org.springblade.purchase.sales.service.*;
 import org.springblade.purchase.sales.vo.OrderVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -44,6 +43,11 @@ public class ExportEnquiryController extends BladeController {
 	private final ICorpsDescClient corpsDescClient;//获取客户信息
 	private final IUserClient userClient;//获取用户信息
 	private final IOrderItemsService orderItemsService;
+	private final IOrderFeesService orderFeesService;
+	private final IOrderFilesService orderFilesService;
+	private final IOrderFreightService orderFreightService;
+	private final IOrderModifyService orderModifyService;
+	private final IOrderPartsService orderPartsService;
 
 	/**
 	 * 详情
@@ -173,7 +177,14 @@ public class ExportEnquiryController extends BladeController {
 			throw  new SecurityException("报价单已生成销售单不能删除");
 		}
 		order.setIsDeleted(1);
-		return R.status(orderService.updateById(order));
+		orderService.updateById(order);
+		orderItemsService.updateByPid(order.getId());
+		orderFeesService.updateByPid(order.getId());
+		orderFilesService.updateByPid(order.getId());
+		orderFreightService.updateByPid(order.getId());
+		orderModifyService.updateByPid(order.getId());
+		orderPartsService.updateByPid(order.getId());
+		return R.success("操作成功");
 	}
 	/**
 	 * 新增或修改 出口询价

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -20,8 +20,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderItems;
-import org.springblade.purchase.sales.service.IOrderItemsService;
-import org.springblade.purchase.sales.service.IOrderService;
+import org.springblade.purchase.sales.service.*;
 import org.springblade.purchase.sales.vo.OrderItemsVO;
 import org.springblade.purchase.sales.vo.OrderVO;
 import org.springblade.system.user.entity.User;
@@ -45,6 +44,11 @@ public class ExportOrderController extends BladeController {
 	private final IOrderItemsService orderItemsService;
 	private final ICorpsDescClient corpsDescClient;//获取客户信息
 	private final IUserClient userClient;//获取用户信息
+	private final IOrderFeesService orderFeesService;
+	private final IOrderFilesService orderFilesService;
+	private final IOrderFreightService orderFreightService;
+	private final IOrderModifyService orderModifyService;
+	private final IOrderPartsService orderPartsService;
 	/**
 	 * 详情
 	 */
@@ -187,7 +191,14 @@ public class ExportOrderController extends BladeController {
 		//是否生成账单
 		LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
 		order.setIsDeleted(1);
-		return R.status(orderService.updateById(order));
+		orderService.updateById(order);
+		orderItemsService.updateByPid(order.getId());
+		orderFeesService.updateByPid(order.getId());
+		orderFilesService.updateByPid(order.getId());
+		orderFreightService.updateByPid(order.getId());
+		orderModifyService.updateByPid(order.getId());
+		orderPartsService.updateByPid(order.getId());
+		return R.success("操作成功");
 	}
 	/**
 	 * 新增或修改 出口销售或采购订单表

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderFeesMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.purchase.sales.entity.OrderFees;
 import org.springblade.purchase.sales.vo.OrderFeesVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,5 +39,10 @@ public interface OrderFeesMapper extends BaseMapper<OrderFees> {
 	 * @return
 	 */
 	List<OrderFeesVO> selectOrderFeesPage(IPage page, OrderFeesVO orderFees);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderFeesMapper.xml

@@ -33,5 +33,8 @@
     <select id="selectOrderFeesPage" resultMap="orderFeesResultMap">
         select * from business_order_fees where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_order_fees SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderFilesMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.purchase.sales.entity.OrderFiles;
 import org.springblade.purchase.sales.vo.OrderFilesVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,5 +39,10 @@ public interface OrderFilesMapper extends BaseMapper<OrderFiles> {
 	 * @return
 	 */
 	List<OrderFilesVO> selectOrderFilesPage(IPage page, OrderFilesVO orderFiles);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderFilesMapper.xml

@@ -24,5 +24,8 @@
     <select id="selectOrderFilesPage" resultMap="orderFilesResultMap">
         select * from business_order_files where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_order_files SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderFreightMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.purchase.sales.entity.OrderFreight;
 import org.springblade.purchase.sales.vo.OrderFreightVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,5 +39,10 @@ public interface OrderFreightMapper extends BaseMapper<OrderFreight> {
 	 * @return
 	 */
 	List<OrderFreightVO> selectOrderFreightPage(IPage page, OrderFreightVO orderFreight);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderFreightMapper.xml

@@ -26,5 +26,8 @@
     <select id="selectOrderFreightPage" resultMap="orderFreightResultMap">
         select * from business_order_freight where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_order_freight SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.java

@@ -60,5 +60,10 @@ public interface OrderItemsMapper extends BaseMapper<OrderItems> {
 									  @Param("tradeType") String tradeType,
 									  @Param("billType") String billType,
 									  @Param("tenantId") String tenantId);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -106,5 +106,8 @@
             and od.busines_date = #{orderEndDate}
         </if>
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_order_items SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderModifyMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.purchase.sales.entity.OrderModify;
 import org.springblade.purchase.sales.vo.OrderModifyVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,5 +39,10 @@ public interface OrderModifyMapper extends BaseMapper<OrderModify> {
 	 * @return
 	 */
 	List<OrderModifyVO> selectOrderModifyPage(IPage page, OrderModifyVO orderModify);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderModifyMapper.xml

@@ -24,5 +24,8 @@
     <select id="selectOrderModifyPage" resultMap="orderModifyResultMap">
         select * from business_order_modify where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_order_modify SET is_deleted = '1' WHERE pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderPartsMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.purchase.sales.entity.OrderParts;
 import org.springblade.purchase.sales.vo.OrderPartsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,5 +39,10 @@ public interface OrderPartsMapper extends BaseMapper<OrderParts> {
 	 * @return
 	 */
 	List<OrderPartsVO> selectOrderPartsPage(IPage page, OrderPartsVO orderParts);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	void updateByPid (@Param("id") Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderPartsMapper.xml

@@ -24,11 +24,15 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="corp_id" property="corpId"/>
         <result column="corp_name" property="corpName"/>
+        <result column="src_pid" property="srcPid"/>
     </resultMap>
 
 
     <select id="selectOrderPartsPage" resultMap="orderPartsResultMap">
         select * from business_order_parts where is_deleted = 0
     </select>
+    <update id="updateByPid" parameterType="long">
+        UPDATE business_order_parts SET is_deleted = '1' WHERE src_pid = #{id}
+    </update>
 
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderFeesService.java

@@ -37,5 +37,10 @@ public interface IOrderFeesService extends IService<OrderFees> {
 	 * @return
 	 */
 	IPage<OrderFeesVO> selectOrderFeesPage(IPage<OrderFeesVO> page, OrderFeesVO orderFees);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderFilesService.java

@@ -37,5 +37,10 @@ public interface IOrderFilesService extends IService<OrderFiles> {
 	 * @return
 	 */
 	IPage<OrderFilesVO> selectOrderFilesPage(IPage<OrderFilesVO> page, OrderFilesVO orderFiles);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderFreightService.java

@@ -37,5 +37,10 @@ public interface IOrderFreightService extends IService<OrderFreight> {
 	 * @return
 	 */
 	IPage<OrderFreightVO> selectOrderFreightPage(IPage<OrderFreightVO> page, OrderFreightVO orderFreight);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderItemsService.java

@@ -72,5 +72,10 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 * @return
 	 */
 	List<OrderItems> getOrderItems(Order order);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderModifyService.java

@@ -37,5 +37,10 @@ public interface IOrderModifyService extends IService<OrderModify> {
 	 * @return
 	 */
 	IPage<OrderModifyVO> selectOrderModifyPage(IPage<OrderModifyVO> page, OrderModifyVO orderModify);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderPartsService.java

@@ -37,5 +37,10 @@ public interface IOrderPartsService extends IService<OrderParts> {
 	 * @return
 	 */
 	IPage<OrderPartsVO> selectOrderPartsPage(IPage<OrderPartsVO> page, OrderPartsVO orderParts);
+	/**
+	 * 更新状态
+	 * @param id
+	 */
+	public void updateByPid(Long id);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderFeesServiceImpl.java

@@ -107,4 +107,8 @@ public class OrderFeesServiceImpl extends ServiceImpl<OrderFeesMapper, OrderFees
 		}
 		return orderFeesList;
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderFilesServiceImpl.java

@@ -71,4 +71,8 @@ public class OrderFilesServiceImpl extends ServiceImpl<OrderFilesMapper, OrderFi
 
 		return list;
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderFreightServiceImpl.java

@@ -37,5 +37,9 @@ public class OrderFreightServiceImpl extends ServiceImpl<OrderFreightMapper, Ord
 	public IPage<OrderFreightVO> selectOrderFreightPage(IPage<OrderFreightVO> page, OrderFreightVO orderFreight) {
 		return page.setRecords(baseMapper.selectOrderFreightPage(page, orderFreight));
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -138,11 +138,13 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 							parts.setCreateTime(new Date());
 							parts.setCreateUser(SecureUtil.getUserId());
 							parts.setPid(item.getId());
+							parts.setSrcPid(item.getPid());
 							orderPartsMapper.insert(parts);
 						}else {
 							parts.setUpdateTime(new Date());
 							parts.setUpdateUser(SecureUtil.getUserId());
 							parts.setPid(item.getId());
+							parts.setSrcPid(item.getPid());
 							orderPartsMapper.updateById(parts);
 						}
 					});
@@ -216,5 +218,9 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		});
 		return list;
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderModifyServiceImpl.java

@@ -70,5 +70,9 @@ public class OrderModifyServiceImpl extends ServiceImpl<OrderModifyMapper, Order
 			});
 		return list;
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderPartsServiceImpl.java

@@ -37,5 +37,9 @@ public class OrderPartsServiceImpl extends ServiceImpl<OrderPartsMapper, OrderPa
 	public IPage<OrderPartsVO> selectOrderPartsPage(IPage<OrderPartsVO> page, OrderPartsVO orderParts) {
 		return page.setRecords(baseMapper.selectOrderPartsPage(page, orderParts));
 	}
+	@Override
+	public void updateByPid(Long id) {
+		baseMapper.updateByPid(id);
+	}
 
 }