From 2df3f64bbacbf960e1d6b9b73893aeb0c01b7d1d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 06 三月 2026 14:37:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 71 +++++++++++++++++
src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java | 18 ++++
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 20 +++++
src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java | 16 ++++
doc/20260306_craete_purchase_return_orders.sql | 33 ++++++++
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 18 ++++
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 22 +++++
7 files changed, 198 insertions(+), 0 deletions(-)
diff --git a/doc/20260306_craete_purchase_return_orders.sql b/doc/20260306_craete_purchase_return_orders.sql
new file mode 100644
index 0000000..6e31d78
--- /dev/null
+++ b/doc/20260306_craete_purchase_return_orders.sql
@@ -0,0 +1,33 @@
+#浜у搧閫�璐у崟琛�
+drop table if exists purchase_return_orders;
+create table purchase_return_orders
+(
+ id bigint auto_increment primary key,
+ no varchar(255) null comment '閫�璐у崟缂栧彿',
+ return_type tinyint not null default 0 comment '閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹',
+ supplier_id bigint not null default 0 comment '渚涘簲鍟唅d',
+ project_id bigint not null default 0 comment '椤圭洰id',
+ project_phase tinyint not null default 0 comment '椤圭洰闃舵',
+ prepared_at datetime null comment '鍒跺崟鏃ユ湡',
+ prepared_user_id bigint not null default 0 comment '鍒跺崟浜篿d',
+ return_user_id bigint not null default 0 comment '閫�鏂欎汉id',
+ purchase_ledger_id bigint not null default 0 comment '閲囪喘璁㈠崟id',
+ remark text null comment '澶囨敞',
+ create_time datetime null comment '褰曞叆鏃堕棿',
+ update_time datetime null comment '鏇存柊鏃堕棿',
+ index idx_purchase_ledger_id (purchase_ledger_id),
+ index idx_project_id (project_id)
+);
+
+#浜у搧閫�璐у崟涓庨噰璐骇鍝佸叧鑱旇〃
+drop table if exists purchase_return_order_products;
+create table purchase_return_order_products
+(
+ id bigint auto_increment primary key,
+ purchase_return_order_id bigint not null default 0 comment '閫�璐у崟id',
+ sales_ledger_product_id bigint not null default 0 comment '閲囪喘浜у搧id',
+ create_time datetime null comment '褰曞叆鏃堕棿',
+ update_time datetime null comment '鏇存柊鏃堕棿',
+ index idx_purchase_return_order_id (purchase_return_order_id),
+ index idx_sales_ledger_product_id (sales_ledger_product_id)
+);
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
new file mode 100644
index 0000000..42363af
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@RestController
+@RequestMapping("/purchaseReturnOrders")
+public class PurchaseReturnOrdersController {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
new file mode 100644
index 0000000..d2c1747
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.mapper;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@Mapper
+public interface PurchaseReturnOrdersMapper extends BaseMapper<PurchaseReturnOrders> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
new file mode 100644
index 0000000..c2004c3
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -0,0 +1,71 @@
+package com.ruoyi.purchase.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@Getter
+@Setter
+@TableName("purchase_return_orders")
+@ApiModel(value = "PurchaseReturnOrders瀵硅薄", description = "閲囪喘閫�璐у崟")
+public class PurchaseReturnOrders implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("閫�璐у崟缂栧彿")
+ private String no;
+
+ @ApiModelProperty("閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹")
+ private Integer returnType;
+
+ @ApiModelProperty("渚涘簲鍟唅d")
+ private Long supplierId;
+
+ @ApiModelProperty("椤圭洰id")
+ private Long projectId;
+
+ @ApiModelProperty("椤圭洰闃舵")
+ private Integer projectPhase;
+
+ @ApiModelProperty("鍒跺崟鏃ユ湡")
+ private LocalDateTime preparedAt;
+
+ @ApiModelProperty("鍒跺崟浜篿d")
+ private Long preparedUserId;
+
+ @ApiModelProperty("閫�鏂欎汉id")
+ private Long returnUserId;
+
+ @ApiModelProperty("閲囪喘璁㈠崟id")
+ private Long purchaseLedgerId;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("褰曞叆鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java
new file mode 100644
index 0000000..6f165e1
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.purchase.service;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+public interface PurchaseReturnOrdersService extends IService<PurchaseReturnOrders> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
new file mode 100644
index 0000000..f052d45
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.purchase.service.impl;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@Service
+public class PurchaseReturnOrdersServiceImpl extends ServiceImpl<PurchaseReturnOrdersMapper, PurchaseReturnOrders> implements PurchaseReturnOrdersService {
+
+}
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
new file mode 100644
index 0000000..8d23060
--- /dev/null
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.purchase.pojo.PurchaseReturnOrders">
+ <id column="id" property="id" />
+ <result column="no" property="no" />
+ <result column="return_type" property="returnType" />
+ <result column="supplier_id" property="supplierId" />
+ <result column="project_id" property="projectId" />
+ <result column="project_phase" property="projectPhase" />
+ <result column="prepared_at" property="preparedAt" />
+ <result column="prepared_user_id" property="preparedUserId" />
+ <result column="return_user_id" property="returnUserId" />
+ <result column="purchase_ledger_id" property="purchaseLedgerId" />
+ <result column="remark" property="remark" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.3