huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重构备货功能

This commit is contained in:
Richie 2025-05-23 21:46:17 +08:00
parent b027b9b4bd
commit 0d10844ef0
13 changed files with 614 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
docs/qihang-oms.sql
View File

@ -881,19 +881,50 @@ CREATE TABLE `o_refund` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `o_ship_stock_up`; DROP TABLE IF EXISTS `o_ship_stock_up`;
CREATE TABLE `o_ship_stock_up` ( CREATE TABLE `o_ship_stock_up` (
`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;
-- ----------------------------
-- 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, `id` bigint NOT NULL AUTO_INCREMENT,
`shop_id` bigint NULL DEFAULT NULL COMMENT '店铺id', `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_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id',
`sale_order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', `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 '订单编号', `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', `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', `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id',
`spec_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_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_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 '商品编码', `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 '商品规格编码', `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 '商品数量', `quantity` int NOT NULL COMMENT '商品数量',
`status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
@ -903,9 +934,6 @@ CREATE TABLE `o_ship_stock_up` (
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发货-备货表（打单加入备货清单）' ROW_FORMAT = DYNAMIC; ) 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_waybill -- Table structure for o_ship_waybill

224
module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUp.java
View File

@ -1,113 +1,111 @@
//package cn.qihangerp.module.order.domain; package cn.qihangerp.module.order.domain;
//
//import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType;
//import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField;
// import com.baomidou.mybatisplus.annotation.TableId;
//import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableName;
//import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable;
//import lombok.Data; import java.util.Date;
// import lombok.Data;
///**
// * 备货表（打单加入备货清单） /**
// * @TableName o_ship_stock_up * 发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）
// */ * @TableName o_ship_stock_up
//@Data */
//public class OShipStockUp implements Serializable { @TableName(value ="o_ship_stock_up")
// /** @Data
// * public class OShipStockUp implements Serializable {
// */ /**
// @TableId(type = IdType.AUTO) *
// private String id; */
// @TableId(type = IdType.AUTO)
// /** private Long id;
// * 店铺id
// */ /**
// private Long shopId; * 店铺id
// */
// /** private Long shopId;
// * erp订单id
// */ /**
// private String saleOrderId; * 店铺类型
// */
// /** private Integer shopType;
// * erp订单itemid
// */ /**
// private String saleOrderItemId; * 发货方 0 仓库发货 1 供应商发货
// */
// /** private Integer shipper;
// * 订单编号
// */ /**
// private String orderNum; * 发货供应商ID（0自己发货）
// */
// /** private Long shipSupplierId;
// * 原始订单skuid
// */ /**
// private String originalSkuId; * 发货供应商
// */
// /** private String shipSupplier;
// * erp系统商品id
// */ /**
// private Long goodsId; * erp订单id
// */
// /** private Long saleOrderId;
// * erp系统商品规格id
// */ /**
// private Long specId; * erp订单itemid
// */
// /** private Long saleOrderItemId;
// * 商品标题
// */ /**
// private String goodsTitle; * 订单编号
// */
// /** private String orderNum;
// * 商品图片
// */ /**
// private String goodsImg; * 状态0待备货1备货中2备货完成3已发货
// */
// /** private Integer status;
// * 商品规格
// */ /**
// private String goodsSpec; * 创建时间
// */
// /** private Date createTime;
// * 商品编码
// */ /**
// private String goodsNum; * 创建人
// */
// /** private String createBy;
// * 商品规格编码
// */ /**
// private String specNum; * 更新时间
// */
// /** private Date updateTime;
// * 商品数量
// */ /**
// private Integer quantity; * 更新人
// */
// /** private String updateBy;
// * 状态0待备货1备货中2已出库3已发货
// */ /**
// private Integer status; * 物流公司
// */
// /** private String shipLogisticsCompany;
// * 创建时间
// */ /**
// private Date createTime; * 物流公司code
// */
// /** private String shipLogisticsCompanyCode;
// * 创建人
// */ /**
// private String createBy; * 物流单号
// */
// /** private String shipLogisticsCode;
// * 更新时间
// */ /**
// private Date updateTime; * 发货状态1：待发货，2：已发货，3已推送
// */
// /** private Integer shipStatus;
// * 更新人
// */ @TableField(exist = false)
// private String updateBy; private static final long serialVersionUID = 1L;
// }
// private static final long serialVersionUID = 1L;
//}

136
module/order/src/main/java/cn/qihangerp/module/order/domain/OShipStockUpItem.java Normal file
View File

@ -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;
}

18
module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpItemMapper.java Normal file
View File

@ -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<OShipStockUpItem> {
}

37
module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipStockUpMapper.java
View File

@ -1,19 +1,18 @@
//package cn.qihangerp.module.order.mapper; package cn.qihangerp.module.order.mapper;
//
// import cn.qihangerp.module.order.domain.OShipStockUp;
//import cn.qihangerp.module.order.domain.OShipStockUp; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
// /**
///** * @author qilip
//* @author qilip * @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Mapper
//* @description 针对表【o_ship_stock_up(备货表（打单加入备货清单）)】的数据库操作Mapper * @createDate 2025-05-23 21:43:16
//* @createDate 2024-07-28 18:29:53 * @Entity cn.qihangerp.module.order.domain.OShipStockUp
//* @Entity cn.qihangerp.module.order.domain.OShipStockUp */
//*/ public interface OShipStockUpMapper extends BaseMapper<OShipStockUp> {
//public interface OShipStockUpMapper extends BaseMapper<OShipStockUp> {
// }
//}
//
//
//
//

13
module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpItemService.java Normal file
View File

@ -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<OShipStockUpItem> {
}

38
module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java
View File

@ -1,25 +1,13 @@
//package cn.qihangerp.module.order.service; package cn.qihangerp.module.order.service;
//
//import cn.qihangerp.common.PageQuery; import cn.qihangerp.module.order.domain.OShipStockUp;
//import cn.qihangerp.common.PageResult; import com.baomidou.mybatisplus.extension.service.IService;
//import cn.qihangerp.module.order.domain.OShipStockUp;
//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; /**
//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; * @author qilip
//import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service
// * @createDate 2025-05-23 21:43:16
///** */
//* @author qilip public interface OShipStockUpService extends IService<OShipStockUp> {
//* @description 针对表【o_ship_stock_up(备货表（打单加入备货清单）)】的数据库操作Service
//* @createDate 2024-07-28 18:29:53 }
//*/
//public interface OShipStockUpService extends IService<OShipStockUp> {
// PageResult<OShipStockUp> queryPageList(ShipStockUpBo bo, PageQuery pageQuery);
//
// /**
// * 备货完成
// * @param bo
// * @return
// */
// int stockUpComplete(ShipStockUpCompleteBo bo);
// int stockUpCompleteByOrder(ShipStockUpCompleteBo bo);
//}

25
module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java Normal file
View File

@ -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<OShipStockUp> {
// PageResult<OShipStockUp> queryPageList(ShipStockUpBo bo, PageQuery pageQuery);
//
// /**
// * 备货完成
// * @param bo
// * @return
// */
// int stockUpComplete(ShipStockUpCompleteBo bo);
// int stockUpCompleteByOrder(ShipStockUpCompleteBo bo);
//}

22
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpItemServiceImpl.java Normal file
View File

@ -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<OShipStockUpItemMapper, OShipStockUpItem>
implements OShipStockUpItemService{
}

129
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl.java
View File

@ -1,107 +1,22 @@
//package cn.qihangerp.module.order.service.impl; package cn.qihangerp.module.order.service.impl;
//
//import cn.qihangerp.module.order.domain.OShipStockUp; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; import cn.qihangerp.module.order.domain.OShipStockUp;
//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; import cn.qihangerp.module.order.service.OShipStockUpService;
//import cn.qihangerp.module.order.mapper.OShipStockUpMapper; import cn.qihangerp.module.order.mapper.OShipStockUpMapper;
//import cn.qihangerp.module.order.service.OShipStockUpService; import org.springframework.stereotype.Service;
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /**
//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @author qilip
//import cn.qihangerp.common.PageQuery; * @description 针对表【o_ship_stock_up(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service实现
//import cn.qihangerp.common.PageResult; * @createDate 2025-05-23 21:43:16
// */
//import lombok.AllArgsConstructor; @Service
//import org.springframework.stereotype.Service; public class OShipStockUpServiceImpl extends ServiceImpl<OShipStockUpMapper, OShipStockUp>
//import org.springframework.util.StringUtils; implements OShipStockUpService{
//
//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<OShipStockUpMapper, OShipStockUp>
// implements OShipStockUpService {
// private final OShipStockUpMapper mapper;
//
// @Override
// public PageResult<OShipStockUp> queryPageList(ShipStockUpBo bo, PageQuery pageQuery) {
// LambdaQueryWrapper<OShipStockUp> queryWrapper = new LambdaQueryWrapper<OShipStockUp>()
// .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<OShipStockUp> 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<OShipStockUp> upList = mapper.selectList(new LambdaQueryWrapper<OShipStockUp>().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;
// }
//}
//
//
//
//

107
module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipStockUpServiceImpl1.java Normal file
View File

@ -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<OShipStockUpMapper, OShipStockUp>
// implements OShipStockUpService {
// private final OShipStockUpMapper mapper;
//
// @Override
// public PageResult<OShipStockUp> queryPageList(ShipStockUpBo bo, PageQuery pageQuery) {
// LambdaQueryWrapper<OShipStockUp> queryWrapper = new LambdaQueryWrapper<OShipStockUp>()
// .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<OShipStockUp> 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<OShipStockUp> upList = mapper.selectList(new LambdaQueryWrapper<OShipStockUp>().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;
// }
//}
//
//
//
//

43
module/order/src/main/resources/mapper/OShipStockUpItemMapper.xml Normal file
View File

@ -0,0 +1,43 @@
<?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="cn.qihangerp.module.order.mapper.OShipStockUpItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.order.domain.OShipStockUpItem">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="BIGINT"/>
<result property="shopType" column="shop_type" jdbcType="INTEGER"/>
<result property="shipper" column="shipper" jdbcType="INTEGER"/>
<result property="shipSupplierId" column="ship_supplier_id" jdbcType="BIGINT"/>
<result property="shipSupplier" column="ship_supplier" jdbcType="VARCHAR"/>
<result property="saleOrderId" column="sale_order_id" jdbcType="BIGINT"/>
<result property="saleOrderItemId" column="sale_order_item_id" jdbcType="BIGINT"/>
<result property="orderNum" column="order_num" jdbcType="VARCHAR"/>
<result property="originalSkuId" column="original_sku_id" jdbcType="VARCHAR"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="skuId" column="sku_id" jdbcType="BIGINT"/>
<result property="goodsTitle" column="goods_title" jdbcType="VARCHAR"/>
<result property="goodsImg" column="goods_img" jdbcType="VARCHAR"/>
<result property="goodsNum" column="goods_num" jdbcType="VARCHAR"/>
<result property="skuName" column="sku_name" jdbcType="VARCHAR"/>
<result property="skuNum" column="sku_num" jdbcType="VARCHAR"/>
<result property="quantity" column="quantity" jdbcType="INTEGER"/>
<result property="status" column="status" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
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
</sql>
</mapper>

36
module/order/src/main/resources/mapper/OShipStockUpMapper.xml Normal file
View File

@ -0,0 +1,36 @@
<?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="cn.qihangerp.module.order.mapper.OShipStockUpMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.order.domain.OShipStockUp">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="BIGINT"/>
<result property="shopType" column="shop_type" jdbcType="INTEGER"/>
<result property="shipper" column="shipper" jdbcType="INTEGER"/>
<result property="shipSupplierId" column="ship_supplier_id" jdbcType="BIGINT"/>
<result property="shipSupplier" column="ship_supplier" jdbcType="VARCHAR"/>
<result property="saleOrderId" column="sale_order_id" jdbcType="BIGINT"/>
<result property="saleOrderItemId" column="sale_order_item_id" jdbcType="BIGINT"/>
<result property="orderNum" column="order_num" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="shipLogisticsCompany" column="ship_logistics_company" jdbcType="VARCHAR"/>
<result property="shipLogisticsCompanyCode" column="ship_logistics_company_code" jdbcType="VARCHAR"/>
<result property="shipLogisticsCode" column="ship_logistics_code" jdbcType="VARCHAR"/>
<result property="shipStatus" column="ship_status" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
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
</sql>
</mapper>