From b027b9b4bdf715e9d66fa3daade828ffc0d4eefc Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Fri, 23 May 2025 21:21:08 +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=EF=BC=9B=E6=89=8B=E5=8A=A8=E5=8F=91=E8=B4=A7=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=A4=87=E8=B4=A7=E3=80=81=E5=88=86=E9=85=8D=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E5=8A=A0=E5=85=A5=E5=A4=87?= =?UTF-8?q?=E8=B4=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShipStockupController.java | 116 ++++----- .../module/order/domain/OShipStockUp.java | 226 +++++++++--------- .../order/mapper/OShipStockUpMapper.java | 38 +-- .../order/service/OShipStockUpService.java | 50 ++-- .../order/service/OShipmentService.java | 9 +- .../service/impl/OShipStockUpServiceImpl.java | 214 ++++++++--------- .../service/impl/OShipmentServiceImpl.java | 222 +++++++---------- .../resources/mapper/OShipStockUpMapper.xml | 38 --- 8 files changed, 409 insertions(+), 504 deletions(-) delete mode 100644 module/order/src/main/resources/mapper/OShipStockUpMapper.xml diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java index 34cf488e..4805387c 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java @@ -1,58 +1,58 @@ -package cn.qihangerp.api.order.controller; - - -import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -import cn.qihangerp.module.order.service.OShipStockUpService; -import cn.qihangerp.module.order.service.OShipWaybillService; -import cn.qihangerp.security.common.BaseController; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -@AllArgsConstructor -@RestController -@RequestMapping("/ship") -public class ShipStockupController extends BaseController { - private final OShipStockUpService shipStockUpService; - private final OShipWaybillService shipWaybillService; - - /** - * 备货列表 - * @param bo - * @param pageQuery - * @return - */ - @GetMapping("/stock_up_list") - public TableDataInfo stock_up_list(ShipStockUpBo bo, PageQuery pageQuery) - { - var pageList = shipStockUpService.queryPageList(bo,pageQuery); - return getDataTable(pageList); - } - - @PostMapping("/stock_up_complete") - public AjaxResult stock_up_complete(@RequestBody ShipStockUpCompleteBo bo) - { - int result = shipStockUpService.stockUpComplete(bo); - if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空"); - if(result == -2) return AjaxResult.error("参数错误：没有要添加的"); - else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单"); - else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！"); - //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry) - return toAjax(1); - } - - @PostMapping("/stock_up_complete_by_order") - public AjaxResult stock_up_completeByOrder(@RequestBody ShipStockUpCompleteBo bo) - { - int result = shipStockUpService.stockUpCompleteByOrder(bo); - if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空"); - if(result == -2) return AjaxResult.error("参数错误：没有要添加的"); - else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单"); - else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！"); - //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry) - return toAjax(1); - } -} +//package cn.qihangerp.api.order.controller; +// +// +//import cn.qihangerp.common.AjaxResult; +//import cn.qihangerp.common.PageQuery; +//import cn.qihangerp.common.TableDataInfo; +//import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +//import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; +//import cn.qihangerp.module.order.service.OShipStockUpService; +//import cn.qihangerp.module.order.service.OShipWaybillService; +//import cn.qihangerp.security.common.BaseController; +//import lombok.AllArgsConstructor; +//import org.springframework.web.bind.annotation.*; +// +//@AllArgsConstructor +//@RestController +//@RequestMapping("/ship") +//public class ShipStockupController extends BaseController { +// private final OShipStockUpService shipStockUpService; +// private final OShipWaybillService shipWaybillService; +// +// /** +// * 备货列表 +// * @param bo +// * @param pageQuery +// * @return +// */ +// @GetMapping("/stock_up_list") +// public TableDataInfo stock_up_list(ShipStockUpBo bo, PageQuery pageQuery) +// { +// var pageList = shipStockUpService.queryPageList(bo,pageQuery); +// return getDataTable(pageList); +// } +// +// @PostMapping("/stock_up_complete") +// public AjaxResult stock_up_complete(@RequestBody ShipStockUpCompleteBo bo) +// { +// int result = shipStockUpService.stockUpComplete(bo); +// if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空"); +// if(result == -2) return AjaxResult.error("参数错误：没有要添加的"); +// else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单"); +// else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！"); +// //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry) +// return toAjax(1); +// } +// +// @PostMapping("/stock_up_complete_by_order") +// public AjaxResult stock_up_completeByOrder(@RequestBody ShipStockUpCompleteBo bo) +// { +// int result = shipStockUpService.stockUpCompleteByOrder(bo); +// if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空"); +// if(result == -2) return AjaxResult.error("参数错误：没有要添加的"); +// else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单"); +// else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！"); +// //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry) +// return toAjax(1); +// } +//} 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 1b4d0c78..8a74e3c1 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,113 @@ -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 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 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 4fd5b3e1..ce67e04b 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,19 @@ -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 2024-07-28 18:29:53 +//* @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/OShipStockUpService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService.java index 3d682440..b120789e 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,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); -} +//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/OShipmentService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java index 08ecf9d0..e2d6af35 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java @@ -31,13 +31,6 @@ public interface OShipmentService extends IService { */ ResultVo handOrderShip(OrderShipBo shipping); - /** - * 订单备货（很多逻辑） - * @param orderNum - * @param shopType - * @return - */ - ResultVo shipStockup(String orderNum, EnumShopType shopType); /** * 发货消息 @@ -47,5 +40,5 @@ public interface OShipmentService extends IService { * @param logisticsCode * @return */ - ResultVo shipSendMessage(String orderNum, EnumShopType shopType,String logisticsCompany,String logisticsCode); +// ResultVo shipSendMessage(String orderNum, EnumShopType shopType,String logisticsCompany,String logisticsCode); } 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 3f6be925..46c10558 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,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; - } -} - - - - +//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/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java index 158073a6..373c167d 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java @@ -12,13 +12,11 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; - import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -38,7 +36,6 @@ public class OShipmentServiceImpl extends ServiceImpl shipStockup(String orderNum, EnumShopType shopType) { - if(shopType.getIndex()==EnumShopType.OFFLINE.getIndex()){ - // OFFLINE 订单处理 - List oOrders = orderMapper.selectList(new LambdaQueryWrapper().eq(OOrder::getOrderNum, orderNum).eq(OOrder::getShopType, shopType.getIndex())); - if(oOrders == null || oOrders.size()==0){ - log.info("===========订单备货错误：OOrder表中没有找到订单数据====="+orderNum); - }else { - log.info("===========订单备货开始处理业务====="+orderNum); - // 1、将order_item数据加入到备货清单中o_ship_stock_up - // 查处item - List items = itemMapper.selectList(new LambdaQueryWrapper().eq(OOrderItem::getOrderId, oOrders.get(0).getId())); - if(items!=null&& items.size()>0){ - for (var item:items) { - List erpShipStockUps = shipStockUpMapper.selectList(new LambdaQueryWrapper().eq(OShipStockUp::getSaleOrderItemId, item.getId())); - if(erpShipStockUps==null || erpShipStockUps.size()==0) { - OShipStockUp shipStockUp = new OShipStockUp(); - shipStockUp.setShopId(oOrders.get(0).getShopId().longValue()); - shipStockUp.setSaleOrderId(item.getOrderId()); - shipStockUp.setSaleOrderItemId(item.getId()); - shipStockUp.setOrderNum(oOrders.get(0).getOrderNum()); - shipStockUp.setOriginalSkuId(item.getSkuId()); - shipStockUp.setGoodsId(item.getGoodsId()); - shipStockUp.setSpecId(item.getGoodsSkuId()); - shipStockUp.setGoodsTitle(item.getGoodsTitle()); - shipStockUp.setGoodsImg(item.getGoodsImg()); - shipStockUp.setGoodsSpec(item.getGoodsSpec()); - shipStockUp.setGoodsNum(item.getGoodsNum()); - shipStockUp.setSpecNum(item.getSkuNum()); - shipStockUp.setQuantity(item.getQuantity()); - shipStockUp.setStatus(0);//状态0待备货1备货中2已出库3已发货 - shipStockUp.setCreateBy("消息通知备货"); - shipStockUp.setCreateTime(new Date()); - shipStockUpMapper.insert(shipStockUp); - } - } - } - } - } - return ResultVo.success(); - } - - @Transactional - @Override - public ResultVo shipSendMessage(String orderNum, EnumShopType shopType,String logisticsCompany,String logisticsCode) { - - List oOrders = orderMapper.selectList(new LambdaQueryWrapper().eq(OOrder::getOrderNum, orderNum).eq(OOrder::getShopType, shopType.getIndex())); - if(oOrders == null || oOrders.size()==0){ - log.info("===========订单发货错误：OOrder表中没有找到订单数据====="+orderNum); - }else { - log.info("===========订单发货开始处理业务====="+orderNum); - // 更新erp sale order 订单表发货状态 - if(oOrders.get(0).getOrderStatus()!=3){ - //2是已发货 - OOrder update = new OOrder(); - update.setId(oOrders.get(0).getId()); - update.setOrderStatus(2); - update.setShippingCompany(logisticsCompany); - update.setShippingNumber(logisticsCode); - update.setShippingCost(BigDecimal.ZERO); - update.setShippingMan("消息通知发货完成"); - update.setShippingTime(new Date()); -// update.setShipStatus(3); - - update.setUpdateTime(new Date()); - update.setUpdateBy("消息通知发货完成"); - orderMapper.updateById(update); - } - // 更新备货表相关订单状态0_ship_stock_up - OShipStockUp shipStockUp = new OShipStockUp(); - shipStockUp.setUpdateBy("消息通知发货完成"); - shipStockUp.setUpdateTime(new Date()); - shipStockUp.setStatus(3);//状态0待备货1备货中2已出库3已发货 - shipStockUpMapper.update(shipStockUp,new LambdaQueryWrapper().eq(OShipStockUp::getSaleOrderId,oOrders.get(0).getId())); - - //插入发货表数据o_shipment & o_shipment_item - List oOrderItems = itemMapper.selectList(new LambdaQueryWrapper().eq(OOrderItem::getOrderId, oOrders.get(0).getId())); - List orderNums = new ArrayList<>(); - List subOrderNums = new ArrayList<>(); - List shippingItemList = new ArrayList<>(); - for (var oOrderItem:oOrderItems) { -// if (oOrderItem.getRefundStatus()!=1) { -// return ResultVo.error(ResultVoEnum.StatusError, orderItemId + "子订单退款状态不允许发货"); -// } - - orderNums.add(oOrderItem.getOrderNum()); - subOrderNums.add(oOrderItem.getSubOrderNum()); - - // 添加shipping_item - OShipmentItem shippingItem = new OShipmentItem(); - shippingItem.setOrderId(oOrderItem.getOrderId()); - shippingItem.setOrderItemId(oOrderItem.getId()); - shippingItem.setOrderNum(oOrderItem.getOrderNum()); - shippingItem.setSubOrderNum(oOrderItem.getSubOrderNum()); - shippingItemList.add(shippingItem); - } - - // 订单发货主表 - OShipment shipping = new OShipment(); - shipping.setShippingType(1);//订单发货 - shipping.setShopId(oOrders.get(0).getShopId()); - shipping.setOrderNums(String.join(", ", orderNums)); - shipping.setSubOrderNums(String.join(", ", subOrderNums)); - shipping.setReceiverName(oOrders.get(0).getReceiverName()); - shipping.setReceiverMobile(oOrders.get(0).getReceiverMobile()); - shipping.setProvince(oOrders.get(0).getProvince()); - shipping.setCity(oOrders.get(0).getCity()); - shipping.setTown(oOrders.get(0).getTown()); - shipping.setAddress(oOrders.get(0).getAddress()); - shipping.setLogisticsCompany(logisticsCompany); - shipping.setLogisticsCompanyCode(logisticsCompany); - shipping.setWaybillCode(logisticsCode); - shipping.setShippingTime(new Date()); -// shipping.setRemark("手动发货"); - shipping.setCreateTime(new Date()); - mapper.insert(shipping); - - // 添加发货子表 - for (var item:shippingItemList) { - item.setShippingId(shipping.getId()); - shippingItemMapper.insert(item); - } - } - - return ResultVo.success(); - } +// @Transactional +// @Override +// public ResultVo shipSendMessage(String orderNum, EnumShopType shopType,String logisticsCompany,String logisticsCode) { +// +// List oOrders = orderMapper.selectList(new LambdaQueryWrapper().eq(OOrder::getOrderNum, orderNum).eq(OOrder::getShopType, shopType.getIndex())); +// if(oOrders == null || oOrders.size()==0){ +// log.info("===========订单发货错误：OOrder表中没有找到订单数据====="+orderNum); +// }else { +// log.info("===========订单发货开始处理业务====="+orderNum); +// // 更新erp sale order 订单表发货状态 +// if(oOrders.get(0).getOrderStatus()!=3){ +// //2是已发货 +// OOrder update = new OOrder(); +// update.setId(oOrders.get(0).getId()); +// update.setOrderStatus(2); +// update.setShippingCompany(logisticsCompany); +// update.setShippingNumber(logisticsCode); +// update.setShippingCost(BigDecimal.ZERO); +// update.setShippingMan("消息通知发货完成"); +// update.setShippingTime(new Date()); +//// update.setShipStatus(3); +// +// update.setUpdateTime(new Date()); +// update.setUpdateBy("消息通知发货完成"); +// orderMapper.updateById(update); +// } +// // 更新备货表相关订单状态0_ship_stock_up +// OShipStockUp shipStockUp = new OShipStockUp(); +// shipStockUp.setUpdateBy("消息通知发货完成"); +// shipStockUp.setUpdateTime(new Date()); +// shipStockUp.setStatus(3);//状态0待备货1备货中2已出库3已发货 +// shipStockUpMapper.update(shipStockUp,new LambdaQueryWrapper().eq(OShipStockUp::getSaleOrderId,oOrders.get(0).getId())); +// +// //插入发货表数据o_shipment & o_shipment_item +// List oOrderItems = itemMapper.selectList(new LambdaQueryWrapper().eq(OOrderItem::getOrderId, oOrders.get(0).getId())); +// List orderNums = new ArrayList<>(); +// List subOrderNums = new ArrayList<>(); +// List shippingItemList = new ArrayList<>(); +// for (var oOrderItem:oOrderItems) { +//// if (oOrderItem.getRefundStatus()!=1) { +//// return ResultVo.error(ResultVoEnum.StatusError, orderItemId + "子订单退款状态不允许发货"); +//// } +// +// orderNums.add(oOrderItem.getOrderNum()); +// subOrderNums.add(oOrderItem.getSubOrderNum()); +// +// // 添加shipping_item +// OShipmentItem shippingItem = new OShipmentItem(); +// shippingItem.setOrderId(oOrderItem.getOrderId()); +// shippingItem.setOrderItemId(oOrderItem.getId()); +// shippingItem.setOrderNum(oOrderItem.getOrderNum()); +// shippingItem.setSubOrderNum(oOrderItem.getSubOrderNum()); +// shippingItemList.add(shippingItem); +// } +// +// // 订单发货主表 +// OShipment shipping = new OShipment(); +// shipping.setShippingType(1);//订单发货 +// shipping.setShopId(oOrders.get(0).getShopId()); +// shipping.setOrderNums(String.join(", ", orderNums)); +// shipping.setSubOrderNums(String.join(", ", subOrderNums)); +// shipping.setReceiverName(oOrders.get(0).getReceiverName()); +// shipping.setReceiverMobile(oOrders.get(0).getReceiverMobile()); +// shipping.setProvince(oOrders.get(0).getProvince()); +// shipping.setCity(oOrders.get(0).getCity()); +// shipping.setTown(oOrders.get(0).getTown()); +// shipping.setAddress(oOrders.get(0).getAddress()); +// shipping.setLogisticsCompany(logisticsCompany); +// shipping.setLogisticsCompanyCode(logisticsCompany); +// shipping.setWaybillCode(logisticsCode); +// shipping.setShippingTime(new Date()); +//// shipping.setRemark("手动发货"); +// shipping.setCreateTime(new Date()); +// mapper.insert(shipping); +// +// // 添加发货子表 +// for (var item:shippingItemList) { +// item.setShippingId(shipping.getId()); +// shippingItemMapper.insert(item); +// } +// +// +// } +// +// return ResultVo.success(); +// } } diff --git a/module/order/src/main/resources/mapper/OShipStockUpMapper.xml b/module/order/src/main/resources/mapper/OShipStockUpMapper.xml deleted file mode 100644 index aaa8b3cd..00000000 --- a/module/order/src/main/resources/mapper/OShipStockUpMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,shop_id,sale_order_id, - sale_order_item_id,order_num,original_sku_id, - goods_id,spec_id,goods_title, - goods_img,goods_spec,goods_num, - spec_num,quantity,status, - create_time,create_by,update_time, - update_by - -