From 11664f71f45b90adcdeeccf875a3252a45680b58 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Sun, 25 May 2025 13:49:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=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=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bo/ShipOrderAllocateShipBo.java | 18 ++ docs/qihang-oms.sql | 9 + .../api/order/controller/OrderController.java | 10 +- ...ntroller.java => OrderShipController.java} | 2 +- .../qihangerp/module/order/domain/OOrder.java | 2 +- .../module/order/domain/OOrderShipList.java | 46 ++++ .../module/order/service/OOrderService.java | 9 + .../order/service/impl/OOrderServiceImpl.java | 224 +++++++++++++++++- .../resources/mapper/OOrderShipListMapper.xml | 12 +- .../order/private/shipPrintOrderList.vue | 100 +++++++- 10 files changed, 418 insertions(+), 14 deletions(-) create mode 100644 core/common/src/main/java/cn/qihangerp/common/bo/ShipOrderAllocateShipBo.java rename microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/{ShipStockupController.java => OrderShipController.java} (98%) diff --git a/core/common/src/main/java/cn/qihangerp/common/bo/ShipOrderAllocateShipBo.java b/core/common/src/main/java/cn/qihangerp/common/bo/ShipOrderAllocateShipBo.java new file mode 100644 index 00000000..23fd5d64 --- /dev/null +++ b/core/common/src/main/java/cn/qihangerp/common/bo/ShipOrderAllocateShipBo.java @@ -0,0 +1,18 @@ +package cn.qihangerp.common.bo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class ShipOrderAllocateShipBo { + 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/docs/qihang-oms.sql b/docs/qihang-oms.sql index 26fe3edd..7aaab8fa 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -883,6 +883,15 @@ CREATE TABLE `o_order_ship_list` ( `ship_supplier` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货供应商', `order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', + `receiver_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', + `receiver_mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', + `address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人地址', + `province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', + `city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', + `town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `buyer_memo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家留言信息', + `seller_memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_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 '物流单号', 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 acef8134..556b9d7b 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 @@ -4,6 +4,7 @@ package cn.qihangerp.api.order.controller; import cn.qihangerp.common.AjaxResult; 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.service.OOrderItemService; import cn.qihangerp.module.order.service.OOrderService; @@ -129,12 +130,11 @@ public class OrderController extends BaseController * @return */ @PostMapping("/allocateShipmentOrder") - public AjaxResult allocateShipmentOrder(@RequestBody ShopOrderShipBo shipBo) + public AjaxResult allocateShipmentOrder(@RequestBody ShipOrderAllocateShipBo shipBo) { -// var result = orderService.allocateShipmentOrder(shipBo,getUsername()); -// if(result.getCode() == 0) return AjaxResult.success(); -// else return AjaxResult.error(result.getMsg()); - return AjaxResult.error("未实现AAA"); + var result = orderService.allocateShipmentOrder(shipBo,getUsername()); + if(result.getCode() == 0) return AjaxResult.success(); + else return AjaxResult.error(result.getMsg()); } } 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/OrderShipController.java similarity index 98% rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipStockupController.java rename to microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java index a43be303..83ae42ef 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/OrderShipController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; @AllArgsConstructor @RestController @RequestMapping("/ship") -public class ShipStockupController extends BaseController { +public class OrderShipController extends BaseController { private final OOrderShipListService shipStockUpService; private final OOrderShipListItemService shipStockUpItemService; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java index 9e8b3cda..a9985c6b 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrder.java @@ -122,7 +122,7 @@ public class OOrder implements Serializable { private Date orderTime; /** - * 发货类型（0仓库发货；1供应商代发；2联合发货） + * 发货类型（0仓库发货；1联合发货;2供应商代发；） */ private Integer shipType; /** diff --git a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java index 7a289dd1..066dbeec 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java @@ -103,6 +103,52 @@ public class OOrderShipList implements Serializable { */ private String updateBy; + /** + * 收件人姓名 + */ + private String receiverName; + + /** + * 收件人手机号 + */ + private String receiverMobile; + + /** + * 收件人地址 + */ + private String address; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String town; + + /** + * 备注 + */ + private String remark; + + /** + * 买家留言信息 + */ + private String buyerMemo; + + /** + * 卖家留言信息 + */ + private String sellerMemo; + + @TableField(exist = false) private List items; 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 7e90325f..27981b4d 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 @@ -1,6 +1,7 @@ package cn.qihangerp.module.order.service; +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; @@ -55,4 +56,12 @@ public interface OOrderService extends IService { * @return */ ResultVo manualShipmentOrder(ShopOrderShipBo shipBo, String createBy); + + /** + * 分配给供应商发货 + * @param shipBo + * @param createBy + * @return + */ + ResultVo allocateShipmentOrder(ShipOrderAllocateShipBo shipBo, String createBy); } 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 9ab27882..cd029b5e 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 @@ -1,10 +1,15 @@ package cn.qihangerp.module.order.service.impl; +import cn.qihangerp.common.bo.ShipOrderAllocateShipBo; import cn.qihangerp.common.bo.ShopOrderShipBo; import cn.qihangerp.domain.OLogisticsCompany; +import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.module.goods.mapper.OGoodsMapper; 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.vo.OrderDiscountVo; @@ -33,9 +38,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -54,6 +57,8 @@ public class OOrderServiceImpl extends ServiceImpl private final OOrderItemMapper orderItemMapper; private final OLogisticsCompanyMapper logisticsCompanyMapper; private final OGoodsSkuMapper oGoodsSkuMapper; + private final OGoodsMapper oGoodsMapper; + private final OGoodsSupplierMapper ogoodsSupplierMapper; private final OOrderShipListMapper orderShipListMapper; private final OOrderShipListItemMapper orderShipListItemMapper; @@ -1601,6 +1606,219 @@ public class OOrderServiceImpl extends ServiceImpl return ResultVo.success(); } + @Override + public ResultVo allocateShipmentOrder(ShipOrderAllocateShipBo shipBo, String createBy) { + if (org.springframework.util.StringUtils.isEmpty(shipBo.getId()) || shipBo.getId().equals("0")) + return ResultVo.error(ResultVoEnum.ParamsError, "缺少参数：id"); + + 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("订单状态不对，不允许发货"); + } + 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(); + if(skuIdZeroCount>0) return ResultVo.error("订单 item 数据中有skuId错误的数据，请补充！"); + + // 按 订单明细找出同供应商 分组 + Map> supplierOrderItemList = new TreeMap<>(); + Map supplierList = new TreeMap<>(); + for(OOrderItem orderItem:oOrderItems){ + OGoodsSku erpGoodsSku = oGoodsSkuMapper.selectById(orderItem.getGoodsSkuId()); + if(erpGoodsSku==null) { + return ResultVo.error("订单明细找不到商品sku信息"); + } + OGoods erpGoods = oGoodsMapper.selectById(erpGoodsSku.getGoodsId()); + if(erpGoods==null){ + return ResultVo.error("订单明细找不到商品信息"); + } + OGoodsSupplier erpSupplier = ogoodsSupplierMapper.selectById(erpGoods.getSupplierId()); + if(erpSupplier==null){ + return ResultVo.error("订单明细商品找不到供应商信息"); + } + // 组合供应商 + boolean isExist = supplierOrderItemList.containsKey(erpSupplier.getId()); + if(isExist){ + supplierOrderItemList.get(erpSupplier.getId()).add(orderItem); + }else{ + List orderItemList = new ArrayList<>(); + orderItemList.add(orderItem); + supplierOrderItemList.put(Long.parseLong(erpSupplier.getId()),orderItemList); + } + supplierList.put(Long.parseLong(erpSupplier.getId()),erpSupplier); + } + + // 开始组装分配数据 + // 遍历 Map + for (Map.Entry> entry : supplierOrderItemList.entrySet()) { + Long supplierId = entry.getKey(); // 获取键（Long） + List orderItemList = entry.getValue(); // 获取值（List） + + // 添加分配发货 +// ErpShipment erpShipment = new ErpShipment(); +// erpShipment.setShipper(1);//发货方 0 仓库发货 1 供应商发货】 +// erpShipment.setSupplierId(supplierId); +// erpShipment.setSupplier(supplierList.get(supplierId)!=null?supplierList.get(supplierId).getName():""); +// erpShipment.setTenantId(erpOrder.getTenantId()); +// erpShipment.setShopId(erpOrder.getShopId()); +// erpShipment.setShopType(erpOrder.getShopType()); +// erpShipment.setOrderId(erpOrder.getId()); +// erpShipment.setOrderNum(erpOrder.getOrderNum()); +// erpShipment.setOrderTime(erpOrder.getOrderTime()); +// erpShipment.setShipType(1);//发货类型（1订单发货2商品补发3商品换货） +// erpShipment.setShipCompany(""); +// erpShipment.setShipCompanyCode(""); +// erpShipment.setShipCode(""); +// erpShipment.setShipFee(BigDecimal.ZERO); +// erpShipment.setShipStatus(0);//物流状态（0 待发货1已发货2已完成） +// +// erpShipment.setPackageHeight(0.0); +// erpShipment.setPackageWeight(0.0); +// erpShipment.setPackageLength(0.0); +// erpShipment.setPackageWidth(0.0); +// erpShipment.setPacksgeOperator(""); +//// erpShipment.setPackages(JSONObject.toJSONString(oOrderItems)); +// erpShipment.setRemark(""); +// erpShipment.setCreateBy(createBy); +// erpShipment.setCreateTime(new Date()); +// +// shipmentMapper.insert(erpShipment); + + // 添加分配发货 + OOrderShipList shipList = new OOrderShipList(); + shipList.setShopId(erpOrder.getShopId()); + shipList.setShopType(erpOrder.getShopType()); + shipList.setShipper(1); + shipList.setShipSupplierId(supplierId); + shipList.setShipSupplier(supplierList.get(supplierId)!=null?supplierList.get(supplierId).getName():""); + shipList.setOrderId(Long.parseLong(erpOrder.getId())); + shipList.setOrderNum(erpOrder.getOrderNum()); + shipList.setStatus(0); + shipList.setShipLogisticsCompany(""); + shipList.setShipLogisticsCompanyCode(""); + shipList.setShipLogisticsCode(""); + shipList.setShipStatus(1); + shipList.setReceiverName(shipBo.getReceiverName()); + shipList.setReceiverMobile(shipBo.getReceiverMobile()); + shipList.setProvince(erpOrder.getProvince()); + shipList.setCity(erpOrder.getCity()); + shipList.setTown(erpOrder.getTown()); + shipList.setAddress(shipBo.getAddress()); + shipList.setSellerMemo(shipBo.getSellerMemo()); + shipList.setBuyerMemo(shipBo.getBuyerMemo()); + shipList.setCreateTime(new Date()); + shipList.setCreateBy("分配供应商发货"); + orderShipListMapper.insert(shipList); + + // 遍历 List + for (OOrderItem item : orderItemList) { + // 打印 List 中的每个 ErpOrderItem 对象 +// ErpShipmentItem erpShipmentItem = new ErpShipmentItem(); +// erpShipmentItem.setSupplierId(erpShipment.getSupplierId()); +// erpShipmentItem.setSupplier(erpShipment.getSupplier()); +// erpShipmentItem.setShipper(erpShipment.getShipper()); +// erpShipmentItem.setTenantId(erpShipment.getTenantId()); +// erpShipmentItem.setShopId(erpShipment.getShopId()); +// erpShipmentItem.setShopType(erpShipment.getShopType()); +// erpShipmentItem.setShipmentId(erpShipment.getId()); +// erpShipmentItem.setOrderId(erpShipment.getOrderId()); +// erpShipmentItem.setOrderNum(erpShipment.getOrderNum()); +// erpShipmentItem.setOrderTime(erpShipment.getOrderTime()); +// erpShipmentItem.setOrderItemId(item.getId()); +// erpShipmentItem.setErpGoodsId(item.getErpGoodsId()); +// erpShipmentItem.setErpSkuId(item.getErpSkuId()); +// erpShipmentItem.setGoodsTitle(item.getGoodsTitle()); +// erpShipmentItem.setGoodsNum(item.getGoodsNum()); +// erpShipmentItem.setGoodsImg(item.getGoodsImg()); +// erpShipmentItem.setGoodsSpec(item.getGoodsSpec()); +// erpShipmentItem.setSkuNum(item.getSkuNum()); +// erpShipmentItem.setQuantity(item.getQuantity()); +// erpShipmentItem.setRemark(item.getRemark()); +// erpShipmentItem.setStockStatus(0); +// erpShipmentItem.setCreateBy(createBy); +// erpShipmentItem.setCreateTime(new Date()); +// shipmentItemMapper.insert(erpShipmentItem); + // 添加备货清单item + OOrderShipListItem listItem=new OOrderShipListItem(); + listItem.setShopId(erpOrder.getShopId()); + listItem.setShopType(erpOrder.getShopType()); + listItem.setListId(shipList.getId()); + listItem.setShipper(shipList.getShipper()); + listItem.setShipSupplier(shipList.getShipSupplier()); + listItem.setShipSupplierId(shipList.getShipSupplierId()); + listItem.setOrderId(Long.parseLong(item.getOrderId())); + listItem.setOrderItemId(Long.parseLong(item.getId())); + listItem.setOrderNum(item.getOrderNum()); + listItem.setOriginalSkuId(item.getSkuId()); + listItem.setGoodsId(item.getGoodsId()); + listItem.setSkuId(item.getGoodsSkuId()); + listItem.setGoodsTitle(item.getGoodsTitle()); + listItem.setGoodsImg(item.getGoodsImg()); + listItem.setGoodsNum(item.getGoodsNum()); + listItem.setSkuName(item.getGoodsSpec()); + listItem.setSkuNum(item.getSkuNum()); + listItem.setQuantity(item.getQuantity()); + listItem.setStatus(0);//状态0待备货1备货中2备货完成3已发货 + listItem.setCreateBy("分配供应商发货"); + listItem.setCreateTime(new Date()); + orderShipListItemMapper.insert(listItem); + + // 更新订单item发货状态 + OOrderItem orderItemUpdate = new OOrderItem(); + orderItemUpdate.setId( item.getId()); + orderItemUpdate.setUpdateBy("分配供应商发货"); + orderItemUpdate.setUpdateTime(new Date()); + orderItemUpdate.setShipStatus(0);//发货状态 0 待发货 1 已发货 + orderItemUpdate.setShipType(1);//发货方式 0 自己发货1供应商发货2联合发货 + orderItemMapper.updateById(orderItemUpdate); + } + } + +// return ResultVo.error("还没有想好怎么实现！"); + +// +// for(ErpOrderItem orderItem:oOrderItems){ +// ErpShipmentItem erpShipmentItem = new ErpShipmentItem(); +// erpShipmentItem.setShipper(erpShipment.getShipper()); +// erpShipmentItem.setTenantId(erpShipment.getTenantId()); +// erpShipmentItem.setShopId(erpShipment.getShopId()); +// erpShipmentItem.setShopType(erpShipment.getShopType()); +// erpShipmentItem.setShipmentId(erpShipment.getId()); +// erpShipmentItem.setOrderId(erpShipment.getOrderId()); +// erpShipmentItem.setOrderNum(erpShipment.getOrderNum()); +// erpShipmentItem.setOrderTime(erpShipment.getOrderTime()); +// erpShipmentItem.setOrderItemId(orderItem.getId()); +// erpShipmentItem.setErpGoodsId(orderItem.getErpGoodsId()); +// erpShipmentItem.setErpSkuId(orderItem.getErpSkuId()); +// erpShipmentItem.setGoodsTitle(orderItem.getGoodsTitle()); +// erpShipmentItem.setGoodsNum(orderItem.getGoodsNum()); +// erpShipmentItem.setGoodsImg(orderItem.getGoodsImg()); +// 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); +// } +// +// + // 更新状态、发货方式 + OOrder update = new OOrder(); + update.setId(erpOrder.getId()); +// update.setShipStatus(1); + update.setShipType(2);//发发货方式 0 自己发货1联合发货2供应商发货 + update.setUpdateTime(new Date()); + update.setUpdateBy("分配供应商发货"); + orderMapper.updateById(update); + + return ResultVo.success(); + } + } diff --git a/module/order/src/main/resources/mapper/OOrderShipListMapper.xml b/module/order/src/main/resources/mapper/OOrderShipListMapper.xml index c7f02f69..3b3f7357 100644 --- a/module/order/src/main/resources/mapper/OOrderShipListMapper.xml +++ b/module/order/src/main/resources/mapper/OOrderShipListMapper.xml @@ -22,6 +22,15 @@ + + + + + + + + + @@ -30,6 +39,7 @@ order_id,order_num,ship_logistics_company, ship_logistics_company_code,ship_logistics_code,ship_status, status,create_time,create_by, - update_time,update_by + update_time,update_by,receiver_name,receiver_mobile,address, + province,city,town,remark,buyer_memo,seller_memo diff --git a/vue/src/views/order/private/shipPrintOrderList.vue b/vue/src/views/order/private/shipPrintOrderList.vue index b866a598..418a9091 100644 --- a/vue/src/views/order/private/shipPrintOrderList.vue +++ b/vue/src/views/order/private/shipPrintOrderList.vue @@ -298,7 +298,6 @@ -