diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopWayBillController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopWayBillController.java new file mode 100644 index 00000000..4ee3e7ee --- /dev/null +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopWayBillController.java @@ -0,0 +1,44 @@ +package cn.qihangerp.oms.controller; + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RequestMapping("/ewaybill") +@RestController +@AllArgsConstructor +public class ShopWayBillController extends BaseController { + + /** + * 获取电子面单账户 + * @param + * @return + * @throws Exception + */ + @RequestMapping(value = "/get_waybill_account_list", method = RequestMethod.GET) + public AjaxResult getWaybillAccountList() throws Exception { + return AjaxResult.error("开源版本不支持电子面单相关功能"); + } + + /** + * 拉取电子面单账户 + * @param + * @return + * @throws Exception + */ + @RequestMapping(value = "/pull_waybill_account", method = RequestMethod.POST) + public AjaxResult pull_waybill_account() throws Exception { + return AjaxResult.error("开源版本不支持电子面单相关功能"); + } + + @RequestMapping(value = "/updateAccount", method = RequestMethod.POST) + public AjaxResult updateAccount( ) throws Exception { + return AjaxResult.error("开源版本不支持电子面单相关功能"); + } + +} diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageServiceImpl.java index 460eb08b..3bc17654 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageServiceImpl.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageServiceImpl.java @@ -7,7 +7,7 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.utils.SpringUtils; import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.module.order.service.ORefundService; -import cn.qihangerp.module.order.service.OShipmentService; +import cn.qihangerp.module.order.service.ErpShipmentService; import cn.qihangerp.module.service.ApiMessageService; import cn.qihangerp.oms.feign.OpenApiService; import com.alibaba.fastjson2.JSONObject; @@ -146,14 +146,14 @@ public class ApiMessageServiceImpl implements ApiMessageService { // 备货消息 log.info("=================收到备货消息=============="); if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { - OShipmentService shipmentService = SpringUtils.getBean(OShipmentService.class); + ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class); // shipmentService.shipStockup(mqMessage.getKeyId(), EnumShopType.OFFLINE); } } else if (mqMessage.getMqType() == MqType.SHIP_SEND_MESSAGE) { // 发货消息 log.info("=================收到发货消息=============="); if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { - OShipmentService shipmentService = SpringUtils.getBean(OShipmentService.class); + ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class); // shipmentService.shipSendMessage(mqMessage.getKeyId(), EnumShopType.OFFLINE, mqMessage.getData1(), mqMessage.getData2()); // orderService.offlineOrderMessage(mqMessage.getKeyId()); } diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java index 2edb4e26..f62496c4 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java @@ -6,6 +6,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.bo.ShipOrderAllocateShipBo; import cn.qihangerp.common.bo.ShopOrderShipBo; +import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; +import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.service.OOrderItemService; import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.request.OrderSearchRequest; @@ -123,7 +125,7 @@ public class OrderController extends BaseController * @return */ @PostMapping("/manualShipment") - public AjaxResult manualShipment(@RequestBody ShopOrderShipBo shipBo) + public AjaxResult manualShipment(@RequestBody OrderShipRequest shipBo) { var result = orderService.manualShipmentOrder(shipBo,getUsername()); if(result.getCode() == 0) return AjaxResult.success(); @@ -137,7 +139,7 @@ public class OrderController extends BaseController * @return */ @PostMapping("/allocateShipmentOrder") - public AjaxResult allocateShipmentOrder(@RequestBody ShipOrderAllocateShipBo shipBo) + public AjaxResult allocateShipmentOrder(@RequestBody OrderAllocateShipRequest shipBo) { var result = orderService.allocateShipmentOrder(shipBo,getUsername()); if(result.getCode() == 0) return AjaxResult.success(); diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java index ec03446b..8fc8687a 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java @@ -1,13 +1,11 @@ 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.OShipment; -import cn.qihangerp.module.order.domain.bo.OrderShipBo; +import cn.qihangerp.module.order.domain.ErpShipment; import cn.qihangerp.module.order.service.OOrderService; -import cn.qihangerp.module.order.service.OShipmentService; +import cn.qihangerp.module.order.service.ErpShipmentService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -16,11 +14,11 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/shipping") public class ShipmentController extends BaseController { - private final OShipmentService shippingService; + private final ErpShipmentService shippingService; private final OOrderService orderService; @GetMapping("/list") - public TableDataInfo list(OShipment shipping, PageQuery pageQuery) + public TableDataInfo list(ErpShipment shipping, PageQuery pageQuery) { return getDataTable(shippingService.queryPageList(shipping,pageQuery)); } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/ErpShipment.java similarity index 62% rename from module/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java rename to module/order/src/main/java/cn/qihangerp/module/order/domain/ErpShipment.java index 590af6df..c9fca8ec 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/ErpShipment.java @@ -4,18 +4,20 @@ 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 lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; +import java.util.List; /** - * 发货-发货记录表 - * @TableName o_shipment + * 发货记录表 + * @TableName erp_shipment */ -@TableName(value ="o_shipment") +@TableName(value ="erp_shipment") @Data -public class OShipment implements Serializable { +public class ErpShipment implements Serializable { /** * */ @@ -27,80 +29,80 @@ public class OShipment implements Serializable { */ private Long shopId; + /** + * 店铺类型 + */ + private Integer shopType; + + /** + * o_order表id + */ + private Long orderId; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 订单时间 + */ + private Date orderTime; + + /** + * 发货方 0 仓库发货 1 供应商发货 + */ + private Integer shipper; + + /** + * 供应商ID + */ + private Long supplierId; + + /** + * 供应商 + */ + private String supplier; + /** * 发货类型（1订单发货2商品补发3商品换货） */ - private Integer shipmentType; - - /** - * 发货的所有订单号，以逗号隔开 - */ - private String orderNums; - - /** - * 收件人姓名 - */ - private String receiverName; - - /** - * 收件人手机号 - */ - private String receiverMobile; - - /** - * 省 - */ - private String province; - - /** - * 市 - */ - private String city; - - /** - * 区 - */ - private String town; - - /** - * 详细地址 - */ - private String address; + private Integer shipType; /** * 物流公司 */ - private String logisticsCompany; + private String shipCompany; /** - * 物流公司编码 + * 物流公司code */ - private String logisticsCompanyCode; + private String shipCompanyCode; /** * 物流单号 */ - private String logisticsCode; + private String shipCode; /** * 物流费用 */ - private BigDecimal shipmentFee; + private BigDecimal shipFee; /** * 发货时间 */ - private Date shipmentTime; + private Date shipTime; /** * 发货操作人 */ - private String shipmentOperator; + private String shipOperator; /** - * 物流状态（1运输中2已完成） + * 物流状态（0 待发货1已发货2已完成） */ - private Integer shipmentStatus; + private Integer shipStatus; /** * 包裹重量 @@ -125,12 +127,12 @@ public class OShipment implements Serializable { /** * 打包操作人 */ - private String packageOperator; + private String packsgeOperator; /** * 打包时间 */ - private Date packageTime; + private Date packsgeTime; /** * 包裹内容JSON @@ -160,8 +162,9 @@ public class OShipment implements Serializable { /** * */ - private Date updateBy; - + private String updateBy; + @TableField(exist = false) + private List itemList; @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/ErpShipmentItem.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/ErpShipmentItem.java new file mode 100644 index 00000000..bb93f60f --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/ErpShipmentItem.java @@ -0,0 +1,147 @@ +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 lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 发货明细表 + * @TableName erp_shipment_item + */ +@TableName(value ="erp_shipment_item") +@Data +public class ErpShipmentItem implements Serializable { + /** + * id，自增 + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 发货id + */ + private Long shipmentId; + + /** + * 发货方 0 仓库发货 1 供应商发货 + */ + private Integer shipper; + + /** + * 供应商ID + */ + private Long supplierId; + + /** + * 供应商 + */ + private String supplier; + + /** + * 店铺类型 + */ + private Integer shopType; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 订单 id + */ + private Long orderId; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 订单时间 + */ + private Date orderTime; + + /** + * 订单itemID（o_order_item外键） + */ + private Long orderItemId; + + /** + * erp系统商品id + */ + private Long erpGoodsId; + + /** + * erp系统商品规格id + */ + private Long erpSkuId; + + /** + * 商品标题 + */ + private String goodsTitle; + + /** + * 商品图片 + */ + private String goodsImg; + + /** + * 商品编码 + */ + private String goodsNum; + + /** + * 商品规格 + */ + private String goodsSpec; + + /** + * 商品规格编码 + */ + private String skuNum; + + /** + * 商品数量 + */ + private Integer quantity; + + /** + * 备注 + */ + private String remark; + + /** + * 仓库状态 0 备货中 1 已出库 2 已发走 + */ + private Integer stockStatus; + + /** + * 创建时间 + */ + 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/domain/OShipmentItem.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java deleted file mode 100644 index 03319e17..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java +++ /dev/null @@ -1,90 +0,0 @@ -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 lombok.Data; - -/** - * 发货-发货记录明细表 - * @TableName o_shipment_item - */ -@TableName(value ="o_shipment_item") -@Data -public class OShipmentItem implements Serializable { - /** - * - */ - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 发货表id - */ - private Long shipmentId; - - /** - * o_order表id - */ - private Long orderId; - - /** - * o_order_item表id - */ - private Long orderItemId; - - /** - * 订单编号（第三方平台） - */ - private String orderNum; - - /** - * 子订单号（第三方平台） - */ - private String subOrderNum; - - /** - * 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; - - @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/bo/OrderAllocateShipRequest.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderAllocateShipRequest.java new file mode 100644 index 00000000..9c4b88b7 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderAllocateShipRequest.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.order.domain.bo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class OrderAllocateShipRequest { + private String Id;//订单id + + private BigDecimal purAmount;//采购金额 + private String receiverName;// + private String receiverMobile;// + private String address;// + private String remark; + private String buyerMemo; + private String sellerMemo; +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipRequest.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipRequest.java new file mode 100644 index 00000000..9cec4af3 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipRequest.java @@ -0,0 +1,21 @@ +package cn.qihangerp.module.order.domain.bo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class OrderShipRequest { + private String Id;//订单id + private Double length; + private Double width; + private Double height; + private Double weight; + private Double volume; + private BigDecimal shippingCost;//物流费用 + private BigDecimal packageAmount;//包装费用 + private String shippingCompany;//发货公司 + private String shippingNumber;//发货单号 + private String shippingMan;//发货人 + private String remark; +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/ErpShipmentItemMapper.java similarity index 70% rename from module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java rename to module/order/src/main/java/cn/qihangerp/module/order/mapper/ErpShipmentItemMapper.java index bd31a2d3..a6ef9319 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/ErpShipmentItemMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OShipmentItem; +import cn.qihangerp.module.order.domain.ErpShipmentItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2025-05-24 16:21:35 * @Entity cn.qihangerp.module.order.domain.OShipmentItem */ -public interface OShipmentItemMapper extends BaseMapper { +public interface ErpShipmentItemMapper extends BaseMapper { } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java b/module/order/src/main/java/cn/qihangerp/module/order/mapper/ErpShipmentMapper.java similarity index 71% rename from module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java rename to module/order/src/main/java/cn/qihangerp/module/order/mapper/ErpShipmentMapper.java index d126cdc1..0024b43c 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/mapper/ErpShipmentMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OShipment; +import cn.qihangerp.module.order.domain.ErpShipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2025-05-24 16:26:06 * @Entity cn.qihangerp.module.order.domain.OShipment */ -public interface OShipmentMapper extends BaseMapper { +public interface ErpShipmentMapper extends BaseMapper { } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java new file mode 100644 index 00000000..122c0a0a --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.order.service; + +import cn.qihangerp.module.order.domain.ErpShipmentItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【erp_shipment_item(发货明细表)】的数据库操作Service +* @createDate 2025-06-01 23:25:11 +*/ +public interface ErpShipmentItemService extends IService { + +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java new file mode 100644 index 00000000..9e1d1e90 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java @@ -0,0 +1,16 @@ +package cn.qihangerp.module.order.service; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.ErpShipment; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【erp_shipment(发货记录表)】的数据库操作Service +* @createDate 2025-06-01 23:22:40 +*/ +public interface ErpShipmentService extends IService { + PageResult queryPageList(ErpShipment shipping, PageQuery pageQuery); + ErpShipment queryDetailById(Long id); +} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java index 79d4249a..322fc93d 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java @@ -5,6 +5,8 @@ import cn.qihangerp.common.bo.ShipOrderAllocateShipBo; import cn.qihangerp.common.bo.ShopOrderShipBo; import cn.qihangerp.module.order.domain.OOrder; import cn.qihangerp.module.order.domain.OOrderItem; +import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; +import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; import cn.qihangerp.request.OrderSearchRequest; import com.alibaba.fastjson2.JSONObject; @@ -80,7 +82,7 @@ public interface OOrderService extends IService { * @param shipBo * @return */ - ResultVo manualShipmentOrder(ShopOrderShipBo shipBo, String createBy); + ResultVo manualShipmentOrder(OrderShipRequest shipBo, String createBy); /** * 分配给供应商发货 @@ -88,5 +90,5 @@ public interface OOrderService extends IService { * @param createBy * @return */ - ResultVo allocateShipmentOrder(ShipOrderAllocateShipBo shipBo, String createBy); + ResultVo allocateShipmentOrder(OrderAllocateShipRequest shipBo, String createBy); } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentItemService.java b/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentItemService.java deleted file mode 100644 index c1d06e49..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentItemService.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.qihangerp.module.order.service; - -import cn.qihangerp.module.order.domain.OShipmentItem; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author qilip -* @description 针对表【o_shipment_item(发货-发货记录明细表)】的数据库操作Service -* @createDate 2025-05-24 16:21:35 -*/ -public interface OShipmentItemService extends IService { - -} 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 deleted file mode 100644 index 61d927fc..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/OShipmentService.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.qihangerp.module.order.service; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.order.domain.OShipment; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author qilip -* @description 针对表【o_shipment(发货-发货记录表)】的数据库操作Service -* @createDate 2025-05-24 16:26:06 -*/ -public interface OShipmentService extends IService { - PageResult queryPageList(OShipment shipping, PageQuery pageQuery); -} diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java new file mode 100644 index 00000000..a8363ee7 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java @@ -0,0 +1,24 @@ +package cn.qihangerp.module.order.service.impl; + +import cn.qihangerp.module.order.domain.ErpShipmentItem; +import cn.qihangerp.module.order.mapper.ErpShipmentItemMapper; +import cn.qihangerp.module.order.service.ErpShipmentItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【erp_shipment_item(发货明细表)】的数据库操作Service实现 +* @createDate 2025-06-01 23:25:11 +*/ +@AllArgsConstructor +@Service +public class ErpShipmentItemServiceImpl extends ServiceImpl + implements ErpShipmentItemService{ + +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java new file mode 100644 index 00000000..e3265fb0 --- /dev/null +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java @@ -0,0 +1,57 @@ +package cn.qihangerp.module.order.service.impl; + +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.order.domain.ErpShipment; +import cn.qihangerp.module.order.domain.ErpShipmentItem; +import cn.qihangerp.module.order.mapper.ErpShipmentItemMapper; +import cn.qihangerp.module.order.mapper.ErpShipmentMapper; +import cn.qihangerp.module.order.service.ErpShipmentService; +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 lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +/** +* @author qilip +* @description 针对表【erp_shipment(发货记录表)】的数据库操作Service实现 +* @createDate 2025-06-01 23:22:40 +*/ +@AllArgsConstructor +@Service +public class ErpShipmentServiceImpl extends ServiceImpl + implements ErpShipmentService{ + private final ErpShipmentItemMapper shipmentItemMapper; + @Override + public PageResult queryPageList(ErpShipment shipping, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(shipping.getShipper()!=null,ErpShipment::getShipper,shipping.getShipper()) + .eq(StringUtils.hasText(shipping.getOrderNum()), ErpShipment::getOrderNum, shipping.getOrderNum()) + .eq(StringUtils.hasText(shipping.getShipCode()), ErpShipment::getShipCode, shipping.getShipCode()) + .eq(shipping.getShopId() != null, ErpShipment::getShopId, shipping.getShopId()); + + Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); + if(pages.getRecords().size()>0){ + for(ErpShipment item : pages.getRecords()){ + item.setItemList(shipmentItemMapper.selectList(new LambdaQueryWrapper() + .eq(ErpShipmentItem::getShipmentId,item.getId()))); + } + } + return PageResult.build(pages); + } + + @Override + public ErpShipment queryDetailById(Long id) { + ErpShipment erpShipment = this.baseMapper.selectById(id); + if(erpShipment!=null){ + erpShipment.setItemList(shipmentItemMapper.selectList(new LambdaQueryWrapper().eq(ErpShipmentItem::getShipmentId,erpShipment.getId()))); + } + return erpShipment; + } +} + + + + diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index 677138c5..4b7c20a7 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -12,6 +12,8 @@ import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; import cn.qihangerp.module.order.domain.*; +import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; +import cn.qihangerp.module.order.domain.bo.OrderShipRequest; import cn.qihangerp.module.order.domain.vo.OrderDiscountVo; import cn.qihangerp.module.order.domain.vo.SalesDailyVo; import cn.qihangerp.module.order.mapper.*; @@ -58,13 +60,13 @@ public class OOrderServiceImpl extends ServiceImpl private final OLogisticsCompanyMapper logisticsCompanyMapper; private final OGoodsSkuMapper oGoodsSkuMapper; private final OGoodsMapper oGoodsMapper; - private final OGoodsSupplierMapper ogoodsSupplierMapper; + private final OGoodsSupplierMapper supplierMapper; private final OOrderShipListMapper orderShipListMapper; private final OOrderShipListItemMapper orderShipListItemMapper; - private final OShipmentMapper shipmentMapper; - private final OShipmentItemMapper shipmentItemMapper; + private final ErpShipmentMapper shipmentMapper; + private final ErpShipmentItemMapper shipmentItemMapper; private final OfflineOrderMapper offlineOrderMapper; private final OfflineOrderItemMapper offlineOrderItemMapper; @@ -1548,25 +1550,27 @@ public class OOrderServiceImpl extends ServiceImpl } /** - * 手动发货-仓库发货 + * 手动发货 * @param shipBo * @param createBy * @return */ @Transactional @Override - public ResultVo manualShipmentOrder(ShopOrderShipBo shipBo, String createBy) { + public ResultVo manualShipmentOrder(OrderShipRequest shipBo, String createBy) { if (org.springframework.util.StringUtils.isEmpty(shipBo.getId()) || shipBo.getId().equals("0")) return ResultVo.error(ResultVoEnum.ParamsError, "缺少参数：id"); - if(org.springframework.util.StringUtils.isEmpty(shipBo.getShippingNumber())) return ResultVo.error("快递单号不能为空"); - OOrder erpOrder = orderMapper.selectById(shipBo.getId()); if (erpOrder == null) { return ResultVo.error("找不到订单数据"); } else if (erpOrder.getOrderStatus().intValue() != 1 && erpOrder.getRefundStatus().intValue() != 1) { return ResultVo.error("订单状态不对，不允许发货"); } + if(erpOrder.getShipStatus()!=0){ + return ResultVo.error("订单已分配供应商发货，不允许手动发货"); + } + OLogisticsCompany erpLogisticsCompany = logisticsCompanyMapper.selectById(shipBo.getShippingCompany()); if(erpLogisticsCompany==null) return ResultVo.error("快递公司选择错误"); @@ -1575,9 +1579,10 @@ public class OOrderServiceImpl extends ServiceImpl new LambdaQueryWrapper() .eq(OOrderItem::getOrderId, erpOrder.getId()) .eq(OOrderItem::getShipStatus,0) - .eq(OOrderItem::getShipType,0) + .eq(OOrderItem::getShipper,0) ); if(oOrderItems==null) return ResultVo.error("订单 item 数据错误，无法发货！"); + // 添加到备货单 OOrderShipList shipList = new OOrderShipList(); shipList.setShopId(erpOrder.getShopId()); @@ -1588,6 +1593,9 @@ public class OOrderServiceImpl extends ServiceImpl shipList.setOrderId(Long.parseLong(erpOrder.getId())); shipList.setOrderNum(erpOrder.getOrderNum()); shipList.setStatus(0); + shipList.setRemark(erpOrder.getRemark()); + shipList.setBuyerMemo(erpOrder.getBuyerMemo()); + shipList.setSellerMemo(erpOrder.getSellerMemo()); shipList.setShipLogisticsCompany(erpLogisticsCompany.getName()); shipList.setShipLogisticsCompanyCode(erpLogisticsCompany.getCode()); shipList.setShipLogisticsCode(shipBo.getShippingNumber()); @@ -1596,36 +1604,33 @@ public class OOrderServiceImpl extends ServiceImpl shipList.setCreateBy("手动发货"); orderShipListMapper.insert(shipList); - // 添加发货记录 - OShipment erpShipment = new OShipment(); + ErpShipment erpShipment = new ErpShipment(); + erpShipment.setShipper(0);//发货方 0 仓库发货 1 供应商发货】 erpShipment.setShopId(erpOrder.getShopId()); - erpShipment.setShipmentType(1); - erpShipment.setOrderNums(erpOrder.getOrderNum()); - erpShipment.setReceiverName(erpOrder.getReceiverName()); - erpShipment.setReceiverMobile(erpOrder.getReceiverMobile()); - erpShipment.setProvince(erpOrder.getProvince()); - erpShipment.setCity(erpOrder.getCity()); - erpShipment.setTown(erpOrder.getTown()); - erpShipment.setAddress(erpOrder.getAddress()); - erpShipment.setLogisticsCompany(erpLogisticsCompany.getName()); - erpShipment.setLogisticsCompanyCode(erpLogisticsCompany.getCode()); - erpShipment.setLogisticsCode(shipBo.getShippingNumber()); - erpShipment.setShipmentFee(shipBo.getShippingCost()); - erpShipment.setShipmentTime(new Date()); - erpShipment.setShipmentOperator(shipBo.getShippingMan()); - erpShipment.setShipmentStatus(1);//物流状态（1运输中2已完成） + erpShipment.setShopType(erpOrder.getShopType()); + erpShipment.setOrderId(Long.parseLong(erpOrder.getId())); + erpShipment.setOrderNum(erpOrder.getOrderNum()); + erpShipment.setOrderTime(erpOrder.getOrderTime()); + erpShipment.setShipType(1);//发货类型（1订单发货2商品补发3商品换货） + erpShipment.setShipCompany(erpLogisticsCompany.getName()); + erpShipment.setShipCompanyCode(erpLogisticsCompany.getCode()); + erpShipment.setShipCode(shipBo.getShippingNumber()); + erpShipment.setShipFee(shipBo.getShippingCost()); + erpShipment.setShipTime(new Date()); + erpShipment.setShipOperator(shipBo.getShippingMan()); + erpShipment.setShipStatus(1);//物流状态（0 待发货1已发货2已完成） erpShipment.setPackageHeight(shipBo.getHeight()); erpShipment.setPackageWeight(shipBo.getWeight()); erpShipment.setPackageLength(shipBo.getLength()); erpShipment.setPackageWidth(shipBo.getWidth()); - erpShipment.setPackageOperator(shipBo.getShippingMan()); - erpShipment.setPackageTime(new Date()); + erpShipment.setPacksgeOperator(shipBo.getShippingMan()); // erpShipment.setPackages(JSONObject.toJSONString(oOrderItems)); erpShipment.setRemark(shipBo.getRemark()); - erpShipment.setCreateBy("手动发货"); + erpShipment.setCreateBy(createBy); erpShipment.setCreateTime(new Date()); + shipmentMapper.insert(erpShipment); for(OOrderItem orderItem:oOrderItems){ @@ -1653,22 +1658,28 @@ public class OOrderServiceImpl extends ServiceImpl listItem.setCreateBy("手动发货"); listItem.setCreateTime(new Date()); orderShipListItemMapper.insert(listItem); - - // 添加发货清单 - OShipmentItem erpShipmentItem = new OShipmentItem(); + // 添加发货明细 + ErpShipmentItem erpShipmentItem = new ErpShipmentItem(); + erpShipmentItem.setShipper(erpShipment.getShipper()); + erpShipmentItem.setShopId(erpShipment.getShopId()); + erpShipmentItem.setShopType(erpShipment.getShopType()); erpShipmentItem.setShipmentId(erpShipment.getId()); - erpShipmentItem.setOrderId(Long.parseLong(orderItem.getOrderId())); - erpShipmentItem.setOrderNum(orderItem.getOrderNum()); + erpShipmentItem.setOrderId(erpShipment.getOrderId()); + erpShipmentItem.setOrderNum(erpShipment.getOrderNum()); + erpShipmentItem.setOrderTime(erpShipment.getOrderTime()); erpShipmentItem.setOrderItemId(Long.parseLong(orderItem.getId())); - erpShipmentItem.setSubOrderNum(orderItem.getSubOrderNum()); - erpShipmentItem.setGoodsId(orderItem.getGoodsId()); - erpShipmentItem.setSkuId(orderItem.getGoodsSkuId()); + erpShipmentItem.setErpGoodsId(orderItem.getGoodsId()); + erpShipmentItem.setErpSkuId(orderItem.getGoodsSkuId()); erpShipmentItem.setGoodsTitle(orderItem.getGoodsTitle()); erpShipmentItem.setGoodsNum(orderItem.getGoodsNum()); erpShipmentItem.setGoodsImg(orderItem.getGoodsImg()); - erpShipmentItem.setSkuName(orderItem.getGoodsSpec()); + erpShipmentItem.setGoodsSpec(orderItem.getGoodsSpec()); erpShipmentItem.setSkuNum(orderItem.getSkuNum()); erpShipmentItem.setQuantity(orderItem.getQuantity()); + erpShipmentItem.setRemark(orderItem.getRemark()); + erpShipmentItem.setStockStatus(0); + erpShipmentItem.setCreateBy(createBy); + erpShipmentItem.setCreateTime(new Date()); shipmentItemMapper.insert(erpShipmentItem); // 更新订单item发货状态 @@ -1676,8 +1687,9 @@ public class OOrderServiceImpl extends ServiceImpl orderItemUpdate.setId( orderItem.getId()); orderItemUpdate.setUpdateBy("手动发货"); orderItemUpdate.setUpdateTime(new Date()); - orderItemUpdate.setShipType(0); - orderItemUpdate.setShipStatus(1);//发货状态 0 待发货 1 已发货 + orderItemUpdate.setShipper(0); + orderItemUpdate.setShipStatus(2);//发货状态 0 待发货 1 已分配供应商发货 2全部发货 + orderItemUpdate.setShipType(2);//发货方式1电子面单发货2手动发货 orderItemMapper.updateById(orderItemUpdate); } @@ -1685,9 +1697,11 @@ public class OOrderServiceImpl extends ServiceImpl // 更新状态、发货方式 OOrder update = new OOrder(); update.setId(erpOrder.getId()); - update.setShipType(0); - update.setShipStatus(2); + update.setShipper(0); + update.setShipStatus(2);//发货状态 0 待发货 1 已分配供应商发货 2全部发货 update.setOrderStatus(2); + update.setShipType(2);//发货方式1电子面单发货2手动发货 + update.setUpdateTime(new Date()); update.setUpdateBy("手动发货"); orderMapper.updateById(update); @@ -1695,8 +1709,14 @@ public class OOrderServiceImpl extends ServiceImpl return ResultVo.success(); } + /** + * 分配供应商发货 + * @param shipBo + * @param createBy + * @return + */ @Override - public ResultVo allocateShipmentOrder(ShipOrderAllocateShipBo shipBo, String createBy) { + public ResultVo allocateShipmentOrder(OrderAllocateShipRequest shipBo, String createBy) { if (org.springframework.util.StringUtils.isEmpty(shipBo.getId()) || shipBo.getId().equals("0")) return ResultVo.error(ResultVoEnum.ParamsError, "缺少参数：id"); @@ -1704,9 +1724,14 @@ public class OOrderServiceImpl extends ServiceImpl if (erpOrder == null) { return ResultVo.error("找不到订单数据"); } else if (erpOrder.getOrderStatus().intValue() != 1 && erpOrder.getRefundStatus().intValue() != 1) { - return ResultVo.error("订单状态不对，不允许发货"); + return ResultVo.error("订单状态不对，不允许分配发货"); } - List oOrderItems = orderItemMapper.selectList(new LambdaQueryWrapper().eq(OOrderItem::getOrderId, erpOrder.getId())); + if(erpOrder.getShipStatus()!=0){ + return ResultVo.error("订单发货已处理，不允许分配发货"); + } + + List oOrderItems = orderItemMapper.selectList(new LambdaQueryWrapper() + .eq(OOrderItem::getOrderId, erpOrder.getId())); if(oOrderItems==null) return ResultVo.error("订单 item 数据错误，无法发货！"); long skuIdZeroCount = oOrderItems.stream().filter(x -> x.getGoodsSkuId() == 0).count(); @@ -1724,7 +1749,7 @@ public class OOrderServiceImpl extends ServiceImpl if(erpGoods==null){ return ResultVo.error("订单明细找不到商品信息"); } - OGoodsSupplier erpSupplier = ogoodsSupplierMapper.selectById(erpGoods.getSupplierId()); + OGoodsSupplier erpSupplier = supplierMapper.selectById(erpGoods.getSupplierId()); if(erpSupplier==null){ return ResultVo.error("订单明细商品找不到供应商信息"); } @@ -1796,6 +1821,8 @@ public class OOrderServiceImpl extends ServiceImpl shipList.setCity(erpOrder.getCity()); shipList.setTown(erpOrder.getTown()); shipList.setAddress(shipBo.getAddress()); + + shipList.setRemark(erpOrder.getRemark()); shipList.setSellerMemo(shipBo.getSellerMemo()); shipList.setBuyerMemo(shipBo.getBuyerMemo()); shipList.setCreateTime(new Date()); @@ -1860,8 +1887,8 @@ public class OOrderServiceImpl extends ServiceImpl orderItemUpdate.setId( item.getId()); orderItemUpdate.setUpdateBy("分配供应商发货"); orderItemUpdate.setUpdateTime(new Date()); - orderItemUpdate.setShipStatus(0);//发货状态 0 待发货 1 已发货 - orderItemUpdate.setShipType(1);//发货方式 0 自己发货1供应商发货2联合发货 + orderItemUpdate.setShipStatus(1);//发货状态 0 待发货 1 已分配供应商发货 2全部发货 + orderItemUpdate.setShipper(2);//发货方式 0 自己发货1联合发货2供应商发货 orderItemMapper.updateById(orderItemUpdate); } } @@ -1899,15 +1926,14 @@ public class OOrderServiceImpl extends ServiceImpl // 更新状态、发货方式 OOrder update = new OOrder(); update.setId(erpOrder.getId()); -// update.setShipStatus(1); - update.setShipType(2);//发发货方式 0 自己发货1联合发货2供应商发货 + update.setShipStatus(1);//发货状态 0 待发货 1 已分配供应商发货 2全部发货 + update.setShipper(2);//发发货方式 0 自己发货1联合发货2供应商发货 update.setUpdateTime(new Date()); update.setUpdateBy("分配供应商发货"); orderMapper.updateById(update); return ResultVo.success(); } - } diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentItemServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentItemServiceImpl.java deleted file mode 100644 index 1225a17a..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentItemServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.qihangerp.module.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.order.domain.OShipmentItem; -import cn.qihangerp.module.order.service.OShipmentItemService; -import cn.qihangerp.module.order.mapper.OShipmentItemMapper; -import org.springframework.stereotype.Service; - -/** -* @author qilip -* @description 针对表【o_shipment_item(发货-发货记录明细表)】的数据库操作Service实现 -* @createDate 2025-05-24 16:21:35 -*/ -@Service -public class OShipmentItemServiceImpl extends ServiceImpl - implements OShipmentItemService{ - -} - - - - 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 deleted file mode 100644 index 920cc4ce..00000000 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipmentServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.qihangerp.module.order.service.impl; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -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.module.order.domain.OShipment; -import cn.qihangerp.module.order.service.OShipmentService; -import cn.qihangerp.module.order.mapper.OShipmentMapper; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** -* @author qilip -* @description 针对表【o_shipment(发货-发货记录表)】的数据库操作Service实现 -* @createDate 2025-05-24 16:26:06 -*/ -@Service -public class OShipmentServiceImpl extends ServiceImpl - implements OShipmentService{ - /** - * 查询发货记录 - * @param shipping - * @param pageQuery - * @return - */ - @Override - public PageResult queryPageList(OShipment shipping, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .likeRight(StringUtils.hasText(shipping.getOrderNums()), OShipment::getOrderNums, shipping.getOrderNums()) - .eq(StringUtils.hasText(shipping.getLogisticsCode()), OShipment::getLogisticsCode, shipping.getLogisticsCode()) - .eq(shipping.getShopId() != null, OShipment::getShopId, shipping.getShopId()); - - Page pages = this.baseMapper.selectPage(pageQuery.build(), queryWrapper); - return PageResult.build(pages); - } -} - - - - diff --git a/module/order/src/main/resources/mapper/ErpShipmentItemMapper.xml b/module/order/src/main/resources/mapper/ErpShipmentItemMapper.xml new file mode 100644 index 00000000..4a55db68 --- /dev/null +++ b/module/order/src/main/resources/mapper/ErpShipmentItemMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,shipment_id,shipper, + supplier_id,supplier,shop_type, + shop_id,order_id,order_num, + order_time,order_item_id,erp_goods_id, + erp_sku_id,goods_title,goods_img, + goods_num,goods_spec,sku_num, + quantity,remark,stock_status, + create_time,create_by,update_time, + update_by + + diff --git a/module/order/src/main/resources/mapper/ErpShipmentMapper.xml b/module/order/src/main/resources/mapper/ErpShipmentMapper.xml new file mode 100644 index 00000000..12a0a1cc --- /dev/null +++ b/module/order/src/main/resources/mapper/ErpShipmentMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,shop_id,shop_type, + order_id,order_num,order_time, + shipper,supplier_id,supplier, + ship_type,ship_company,ship_company_code, + ship_code,ship_fee,ship_time, + ship_operator,ship_status,package_weight, + package_length,package_width,package_height, + packsge_operator,packsge_time,packages, + remark,create_time,create_by, + update_time,update_by + + diff --git a/module/order/src/main/resources/mapper/OShipmentItemMapper.xml b/module/order/src/main/resources/mapper/OShipmentItemMapper.xml deleted file mode 100644 index 5ce3ee86..00000000 --- a/module/order/src/main/resources/mapper/OShipmentItemMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id,shipment_id,order_id, - order_item_id,order_num,sub_order_num, - goods_id,sku_id,goods_title, - goods_img,goods_num,sku_name, - sku_num,quantity - - diff --git a/module/order/src/main/resources/mapper/OShipmentMapper.xml b/module/order/src/main/resources/mapper/OShipmentMapper.xml deleted file mode 100644 index 3c5bd058..00000000 --- a/module/order/src/main/resources/mapper/OShipmentMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,shop_id,shipment_type, - order_nums,receiver_name,receiver_mobile, - province,city,town, - address,logistics_company,logistics_company_code, - logistics_code,shipment_fee,shipment_time, - shipment_operator,shipment_status,package_weight, - package_length,package_width,package_height, - package_operator,package_time,packages, - remark,create_time,create_by, - update_time,update_by - - diff --git a/vue/src/api/shop/ewaybill.js b/vue/src/api/shop/ewaybill.js new file mode 100644 index 00000000..14ec7008 --- /dev/null +++ b/vue/src/api/shop/ewaybill.js @@ -0,0 +1,30 @@ +import request from '@/utils/request' + +// 列表 +export function getWaybillAccountList(params) { + return request({ + url: '/api/oms-api/ewaybill/get_waybill_account_list', + method: 'get', + params: params + }) +} + +// 更新电子面单账户 +export function pullWaybillAccount(data) { + return request({ + url: '/api/oms-api/ewaybill/pull_waybill_account', + method: 'post', + data: data + }) +} + +// 取号并发货 +export function getWaybillCodeAndSend(data) { + return request({ + url: '/api/oms-api/ewaybill/get_waybill_code_and_send', + method: 'post', + data: data + }) +} + + diff --git a/vue/src/views/shipping/logistics/company.vue b/vue/src/views/shipping/logistics/company.vue index e957e479..8e4b14ad 100644 --- a/vue/src/views/shipping/logistics/company.vue +++ b/vue/src/views/shipping/logistics/company.vue @@ -10,7 +10,7 @@ - + 添加 + v-hasPermi="['shop:shop:add']" + >新增 + + + API拉取快递公司数据 - - - - - - - - - - + @@ -76,6 +77,22 @@ icon="el-icon-delete" @click="handleUpdateStatus(scope.row)" >关闭 + + 修改 + 删除 + @@ -88,24 +105,34 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - - - - + + + + + - - + + + + + + + + + + + - + - - -
确 定 @@ -116,11 +143,18 @@ diff --git a/vue/src/views/shipping/logistics/ewaybill_account.vue b/vue/src/views/shipping/logistics/ewaybill_account.vue new file mode 100644 index 00000000..29488782 --- /dev/null +++ b/vue/src/views/shipping/logistics/ewaybill_account.vue @@ -0,0 +1,367 @@ + + + diff --git a/vue/src/views/shipping/logistics/index.vue b/vue/src/views/shipping/logistics/index.vue index f2840792..58daa502 100644 --- a/vue/src/views/shipping/logistics/index.vue +++ b/vue/src/views/shipping/logistics/index.vue @@ -5,7 +5,7 @@ - + @@ -14,11 +14,11 @@