From 0d10844ef0585be1c2fb770f6aab2a73a75aa529 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Fri, 23 May 2025 21:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=A4=87=E8=B4=A7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/qihang-oms.sql | 72 ++++-- .../module/order/domain/OShipStockUp.java | 224 +++++++++--------- .../module/order/domain/OShipStockUpItem.java | 136 +++++++++++ .../order/mapper/OShipStockUpItemMapper.java | 18 ++ .../order/mapper/OShipStockUpMapper.java | 37 ++- .../service/OShipStockUpItemService.java | 13 + .../order/service/OShipStockUpService.java | 38 +-- .../order/service/OShipStockUpService1.java | 25 ++ .../impl/OShipStockUpItemServiceImpl.java | 22 ++ .../service/impl/OShipStockUpServiceImpl.java | 129 ++-------- .../impl/OShipStockUpServiceImpl1.java | 107 +++++++++ .../mapper/OShipStockUpItemMapper.xml | 43 ++++ .../resources/mapper/OShipStockUpMapper.xml | 36 +++ 13 files changed, 614 insertions(+), 286 deletions(-) create mode 100644 module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java create mode 100644 module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java create mode 100644 module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java create mode 100644 module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java create mode 100644 module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java create mode 100644 module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl1.java create mode 100644 module/order/src/main/resources/mapper/OShipStockUpItemMapper.xml create mode 100644 module/order/src/main/resources/mapper/OShipStockUpMapper.xml diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql index b9df5d85..d654bbcc 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -881,31 +881,59 @@ CREATE TABLE `o_refund` ( -- ---------------------------- DROP TABLE IF EXISTS `o_ship_stock_up`; CREATE TABLE `o_ship_stock_up` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `shop_id` bigint NULL DEFAULT NULL COMMENT '店铺id', - `sale_order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', - `sale_order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', - `original_sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原始订单skuid', - `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id', - `spec_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品规格id', - `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `goods_spec` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', - `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `spec_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', - `quantity` int NOT NULL COMMENT '商品数量', - `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表（打单加入备货清单）' ROW_FORMAT = DYNAMIC; + `id` bigint NOT NULL AUTO_INCREMENT, + `shop_id` bigint NOT NULL COMMENT '店铺id', + `shop_type` int NOT NULL COMMENT '店铺类型', + `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方 0 仓库发货 1 供应商发货', + `ship_supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '发货供应商ID（0自己发货）', + `ship_supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货供应商', + `sale_order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', + `sale_order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', + `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', + `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `ship_logistics_company` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', + `ship_logistics_company_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司code', + `ship_logistics_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', + `ship_status` int NOT NULL COMMENT '发货状态1：待发货，2：已发货，3已推送', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）' ROW_FORMAT = DYNAMIC; + -- ---------------------------- --- Records of o_ship_stock_up +-- Table structure for o_ship_stock_up_item -- ---------------------------- +DROP TABLE IF EXISTS `o_ship_stock_up_item`; +CREATE TABLE `o_ship_stock_up_item` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `shop_id` bigint NULL DEFAULT NULL COMMENT '店铺id', + `shop_type` int NOT NULL COMMENT '店铺类型', + `shipper` int NOT NULL DEFAULT 0 COMMENT '发货方 0 仓库发货 1 供应商发货', + `ship_supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '发货供应商ID（0自己发货）', + `ship_supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货供应商', + `sale_order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', + `sale_order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', + `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', + `original_sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原始订单skuid', + `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id', + `sku_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品规格id', + `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `sku_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `sku_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `quantity` int NOT NULL COMMENT '商品数量', + `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表（打单加入备货清单）' ROW_FORMAT = DYNAMIC; + -- ---------------------------- -- Table structure for o_ship_waybill diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java index 8a74e3c1..b6e36049 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java @@ -1,113 +1,111 @@ -//package cn.qihangerp.module.order.domain; -// -//import java.io.Serializable; -//import java.util.Date; -// -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableId; -//import lombok.Data; -// -///** -// * 备货表（打单加入备货清单） -// * @TableName o_ship_stock_up -// */ -//@Data -//public class OShipStockUp implements Serializable { -// /** -// * -// */ -// @TableId(type = IdType.AUTO) -// private String id; -// -// /** -// * 店铺id -// */ -// private Long shopId; -// -// /** -// * erp订单id -// */ -// private String saleOrderId; -// -// /** -// * erp订单itemid -// */ -// private String saleOrderItemId; -// -// /** -// * 订单编号 -// */ -// private String orderNum; -// -// /** -// * 原始订单skuid -// */ -// private String originalSkuId; -// -// /** -// * erp系统商品id -// */ -// private Long goodsId; -// -// /** -// * erp系统商品规格id -// */ -// private Long specId; -// -// /** -// * 商品标题 -// */ -// private String goodsTitle; -// -// /** -// * 商品图片 -// */ -// private String goodsImg; -// -// /** -// * 商品规格 -// */ -// private String goodsSpec; -// -// /** -// * 商品编码 -// */ -// private String goodsNum; -// -// /** -// * 商品规格编码 -// */ -// private String specNum; -// -// /** -// * 商品数量 -// */ -// private Integer quantity; -// -// /** -// * 状态0待备货1备货中2已出库3已发货 -// */ -// private Integer status; -// -// /** -// * 创建时间 -// */ -// private Date createTime; -// -// /** -// * 创建人 -// */ -// private String createBy; -// -// /** -// * 更新时间 -// */ -// private Date updateTime; -// -// /** -// * 更新人 -// */ -// private String updateBy; -// -// private static final long serialVersionUID = 1L; -//} \ No newline at end of file +package cn.qihangerp.module.order.domain; + +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.util.Date; +import lombok.Data; + +/** + * 发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单） + * @TableName o_ship_stock_up + */ +@TableName(value ="o_ship_stock_up") +@Data +public class OShipStockUp implements Serializable { + /** + * + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 店铺类型 + */ + private Integer shopType; + + /** + * 发货方 0 仓库发货 1 供应商发货 + */ + private Integer shipper; + + /** + * 发货供应商ID（0自己发货） + */ + private Long shipSupplierId; + + /** + * 发货供应商 + */ + private String shipSupplier; + + /** + * erp订单id + */ + private Long saleOrderId; + + /** + * erp订单itemid + */ + private Long saleOrderItemId; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 状态0待备货1备货中2备货完成3已发货 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 物流公司 + */ + private String shipLogisticsCompany; + + /** + * 物流公司code + */ + private String shipLogisticsCompanyCode; + + /** + * 物流单号 + */ + private String shipLogisticsCode; + + /** + * 发货状态1：待发货，2：已发货，3已推送 + */ + private Integer shipStatus; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java new file mode 100644 index 00000000..b0cb03c1 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java @@ -0,0 +1,136 @@ +package cn.qihangerp.module.order.domain; + +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.util.Date; +import lombok.Data; + +/** + * 发货-备货表（打单加入备货清单） + * @TableName o_ship_stock_up_item + */ +@TableName(value ="o_ship_stock_up_item") +@Data +public class OShipStockUpItem implements Serializable { + /** + * + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 店铺类型 + */ + private Integer shopType; + + /** + * 发货方 0 仓库发货 1 供应商发货 + */ + private Integer shipper; + + /** + * 发货供应商ID（0自己发货） + */ + private Long shipSupplierId; + + /** + * 发货供应商 + */ + private String shipSupplier; + + /** + * erp订单id + */ + private Long saleOrderId; + + /** + * erp订单itemid + */ + private Long saleOrderItemId; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 原始订单skuid + */ + private String originalSkuId; + + /** + * erp系统商品id + */ + private Long goodsId; + + /** + * erp系统商品规格id + */ + private Long skuId; + + /** + * 商品标题 + */ + private String goodsTitle; + + /** + * 商品图片 + */ + private String goodsImg; + + /** + * 商品编码 + */ + private String goodsNum; + + /** + * 商品规格 + */ + private String skuName; + + /** + * 商品规格编码 + */ + private String skuNum; + + /** + * 商品数量 + */ + private Integer quantity; + + /** + * 状态0待备货1备货中2备货完成3已发货 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新人 + */ + private String updateBy; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java new file mode 100644 index 00000000..9f87e14f --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.order.mapper; + +import cn.qihangerp.module.order.domain.OShipStockUpItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_ship_stock_up_item(发货-备货表（打单加入备货清单）)】的数据库操作Mapper +* @createDate 2025-05-23 21:43:16 +* @Entity cn.qihangerp.module.order.domain.OShipStockUpItem +*/ +public interface OShipStockUpItemMapper extends BaseMapper { + +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java index ce67e04b..64e93d62 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java @@ -1,19 +1,18 @@ -//package cn.qihangerp.module.order.mapper; -// -// -//import cn.qihangerp.module.order.domain.OShipStockUp; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -// -///** -//* @author qilip -//* @description 针对表【o_ship_stock_up(备货表（打单加入备货清单）)】的数据库操作Mapper -//* @createDate 2024-07-28 18:29:53 -//* @Entity cn.qihangerp.module.order.domain.OShipStockUp -//*/ -//public interface OShipStockUpMapper extends BaseMapper { -// -//} -// -// -// -// +package cn.qihangerp.module.order.mapper; + +import cn.qihangerp.module.order.domain.OShipStockUp; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Mapper +* @createDate 2025-05-23 21:43:16 +* @Entity cn.qihangerp.module.order.domain.OShipStockUp +*/ +public interface OShipStockUpMapper extends BaseMapper { + +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java new file mode 100644 index 00000000..53d9e6cd --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.order.service; + +import cn.qihangerp.module.order.domain.OShipStockUpItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_ship_stock_up_item(发货-备货表（打单加入备货清单）)】的数据库操作Service +* @createDate 2025-05-23 21:43:16 +*/ +public interface OShipStockUpItemService extends IService { + +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java index b120789e..19a65e15 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java @@ -1,25 +1,13 @@ -//package cn.qihangerp.module.order.service; -// -//import cn.qihangerp.common.PageQuery; -//import cn.qihangerp.common.PageResult; -//import cn.qihangerp.module.order.domain.OShipStockUp; -//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -//import com.baomidou.mybatisplus.extension.service.IService; -// -///** -//* @author qilip -//* @description 针对表【o_ship_stock_up(备货表（打单加入备货清单）)】的数据库操作Service -//* @createDate 2024-07-28 18:29:53 -//*/ -//public interface OShipStockUpService extends IService { -// PageResult queryPageList(ShipStockUpBo bo, PageQuery pageQuery); -// -// /** -// * 备货完成 -// * @param bo -// * @return -// */ -// int stockUpComplete(ShipStockUpCompleteBo bo); -// int stockUpCompleteByOrder(ShipStockUpCompleteBo bo); -//} +package cn.qihangerp.module.order.service; + +import cn.qihangerp.module.order.domain.OShipStockUp; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service +* @createDate 2025-05-23 21:43:16 +*/ +public interface OShipStockUpService extends IService { + +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java new file mode 100644 index 00000000..b120789e --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java @@ -0,0 +1,25 @@ +//package cn.qihangerp.module.order.service; +// +//import cn.qihangerp.common.PageQuery; +//import cn.qihangerp.common.PageResult; +//import cn.qihangerp.module.order.domain.OShipStockUp; +//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; +//import com.baomidou.mybatisplus.extension.service.IService; +// +///** +//* @author qilip +//* @description 针对表【o_ship_stock_up(备货表（打单加入备货清单）)】的数据库操作Service +//* @createDate 2024-07-28 18:29:53 +//*/ +//public interface OShipStockUpService extends IService { +// PageResult queryPageList(ShipStockUpBo bo, PageQuery pageQuery); +// +// /** +// * 备货完成 +// * @param bo +// * @return +// */ +// int stockUpComplete(ShipStockUpCompleteBo bo); +// int stockUpCompleteByOrder(ShipStockUpCompleteBo bo); +//} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java new file mode 100644 index 00000000..c7a0dd0a --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java @@ -0,0 +1,22 @@ +package cn.qihangerp.module.order.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.order.domain.OShipStockUpItem; +import cn.qihangerp.module.order.service.OShipStockUpItemService; +import cn.qihangerp.module.order.mapper.OShipStockUpItemMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【o_ship_stock_up_item(发货-备货表（打单加入备货清单）)】的数据库操作Service实现 +* @createDate 2025-05-23 21:43:16 +*/ +@Service +public class OShipStockUpItemServiceImpl extends ServiceImpl + implements OShipStockUpItemService{ + +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java index 46c10558..7f773e52 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java @@ -1,107 +1,22 @@ -//package cn.qihangerp.module.order.service.impl; -// -//import cn.qihangerp.module.order.domain.OShipStockUp; -//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -//import cn.qihangerp.module.order.mapper.OShipStockUpMapper; -//import cn.qihangerp.module.order.service.OShipStockUpService; -//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import cn.qihangerp.common.PageQuery; -//import cn.qihangerp.common.PageResult; -// -//import lombok.AllArgsConstructor; -//import org.springframework.stereotype.Service; -//import org.springframework.util.StringUtils; -// -//import java.util.Date; -//import java.util.List; -// -///** -//* @author qilip -//* @description 针对表【o_ship_stock_up(备货表（打单加入备货清单）)】的数据库操作Service实现 -//* @createDate 2024-07-28 18:29:53 -//*/ -//@AllArgsConstructor -//@Service -//public class OShipStockUpServiceImpl extends ServiceImpl -// implements OShipStockUpService { -// private final OShipStockUpMapper mapper; -// -// @Override -// public PageResult queryPageList(ShipStockUpBo bo, PageQuery pageQuery) { -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() -// .eq(bo.getShopId()!=null,OShipStockUp::getShopId,bo.getShopId()) -// .eq(bo.getStatus()!=null,OShipStockUp::getStatus,bo.getStatus()) -// .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUp::getOrderNum,bo.getOrderNum()) -// ; -// Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); -// -// return PageResult.build(pages); -// } -// -// /** -// * 备货完成 -// * @param bo -// * @return -// */ -// @Override -// public int stockUpComplete(ShipStockUpCompleteBo bo) { -// -// if(bo.getIds() == null || bo.getIds().length == 0) return -1; -// -// int total=0; -// // 循环判断状态 -// for (Long id:bo.getIds()) { -// OShipStockUp up = mapper.selectById(id); -// if (up != null) { -// if (up.getStatus() == 0 || up.getStatus() == 1) { -// OShipStockUp update = new OShipStockUp(); -// update.setId(id.toString()); -// update.setStatus(2);//备货完成 -// update.setUpdateBy("备货完成"); -// update.setUpdateTime(new Date()); -// mapper.updateById(update); -// } -// } -// } -// -// return 1; -// } -// -// /** -// * 备货完成 by Order -// * @param bo -// * @return -// */ -// @Override -// public int stockUpCompleteByOrder(ShipStockUpCompleteBo bo) { -// -// if(bo.getOrderNums() == null || bo.getOrderNums().length == 0) return -1; -// -// int total=0; -// // 循环判断状态 -// for (String orderNum:bo.getOrderNums()) { -// List upList = mapper.selectList(new LambdaQueryWrapper().eq(OShipStockUp::getOrderNum,orderNum)); -// if (upList != null) { -// for(OShipStockUp up : upList) { -// if (up.getStatus() == 0 || up.getStatus() == 1) { -// OShipStockUp update = new OShipStockUp(); -// update.setId(up.getId()); -// update.setStatus(2);//备货完成 -// update.setUpdateBy("备货完成"); -// update.setUpdateTime(new Date()); -// mapper.updateById(update); -// } -// } -// } -// } -// -// return 1; -// } -//} -// -// -// -// +package cn.qihangerp.module.order.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.order.domain.OShipStockUp; +import cn.qihangerp.module.order.service.OShipStockUpService; +import cn.qihangerp.module.order.mapper.OShipStockUpMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service实现 +* @createDate 2025-05-23 21:43:16 +*/ +@Service +public class OShipStockUpServiceImpl extends ServiceImpl + implements OShipStockUpService{ + +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl1.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl1.java new file mode 100644 index 00000000..46c10558 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl1.java @@ -0,0 +1,107 @@ +//package cn.qihangerp.module.order.service.impl; +// +//import cn.qihangerp.module.order.domain.OShipStockUp; +//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; +//import cn.qihangerp.module.order.mapper.OShipStockUpMapper; +//import cn.qihangerp.module.order.service.OShipStockUpService; +//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import cn.qihangerp.common.PageQuery; +//import cn.qihangerp.common.PageResult; +// +//import lombok.AllArgsConstructor; +//import org.springframework.stereotype.Service; +//import org.springframework.util.StringUtils; +// +//import java.util.Date; +//import java.util.List; +// +///** +//* @author qilip +//* @description 针对表【o_ship_stock_up(备货表（打单加入备货清单）)】的数据库操作Service实现 +//* @createDate 2024-07-28 18:29:53 +//*/ +//@AllArgsConstructor +//@Service +//public class OShipStockUpServiceImpl extends ServiceImpl +// implements OShipStockUpService { +// private final OShipStockUpMapper mapper; +// +// @Override +// public PageResult queryPageList(ShipStockUpBo bo, PageQuery pageQuery) { +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() +// .eq(bo.getShopId()!=null,OShipStockUp::getShopId,bo.getShopId()) +// .eq(bo.getStatus()!=null,OShipStockUp::getStatus,bo.getStatus()) +// .eq(StringUtils.hasText(bo.getOrderNum()),OShipStockUp::getOrderNum,bo.getOrderNum()) +// ; +// Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); +// +// return PageResult.build(pages); +// } +// +// /** +// * 备货完成 +// * @param bo +// * @return +// */ +// @Override +// public int stockUpComplete(ShipStockUpCompleteBo bo) { +// +// if(bo.getIds() == null || bo.getIds().length == 0) return -1; +// +// int total=0; +// // 循环判断状态 +// for (Long id:bo.getIds()) { +// OShipStockUp up = mapper.selectById(id); +// if (up != null) { +// if (up.getStatus() == 0 || up.getStatus() == 1) { +// OShipStockUp update = new OShipStockUp(); +// update.setId(id.toString()); +// update.setStatus(2);//备货完成 +// update.setUpdateBy("备货完成"); +// update.setUpdateTime(new Date()); +// mapper.updateById(update); +// } +// } +// } +// +// return 1; +// } +// +// /** +// * 备货完成 by Order +// * @param bo +// * @return +// */ +// @Override +// public int stockUpCompleteByOrder(ShipStockUpCompleteBo bo) { +// +// if(bo.getOrderNums() == null || bo.getOrderNums().length == 0) return -1; +// +// int total=0; +// // 循环判断状态 +// for (String orderNum:bo.getOrderNums()) { +// List upList = mapper.selectList(new LambdaQueryWrapper().eq(OShipStockUp::getOrderNum,orderNum)); +// if (upList != null) { +// for(OShipStockUp up : upList) { +// if (up.getStatus() == 0 || up.getStatus() == 1) { +// OShipStockUp update = new OShipStockUp(); +// update.setId(up.getId()); +// update.setStatus(2);//备货完成 +// update.setUpdateBy("备货完成"); +// update.setUpdateTime(new Date()); +// mapper.updateById(update); +// } +// } +// } +// } +// +// return 1; +// } +//} +// +// +// +// diff --git a/module/order/src/main/resources/mapper/OShipStockUpItemMapper.xml b/module/order/src/main/resources/mapper/OShipStockUpItemMapper.xml new file mode 100644 index 00000000..e629297f --- /dev/null +++ b/module/order/src/main/resources/mapper/OShipStockUpItemMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,shop_id,shop_type, + shipper,ship_supplier_id,ship_supplier, + sale_order_id,sale_order_item_id,order_num, + original_sku_id,goods_id,sku_id, + goods_title,goods_img,goods_num, + sku_name,sku_num,quantity, + status,create_time,create_by, + update_time,update_by + + diff --git a/module/order/src/main/resources/mapper/OShipStockUpMapper.xml b/module/order/src/main/resources/mapper/OShipStockUpMapper.xml new file mode 100644 index 00000000..97d611c3 --- /dev/null +++ b/module/order/src/main/resources/mapper/OShipStockUpMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id,shop_id,shop_type, + shipper,ship_supplier_id,ship_supplier, + sale_order_id,sale_order_item_id,order_num, + status,create_time,create_by, + update_time,update_by,ship_logistics_company, + ship_logistics_company_code,ship_logistics_code,ship_status + +