Merge branch 'master' into dev

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxOrderCheckInfo/BoxOrderCheckInfoService.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.service.IService;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
+import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.shipment.dal.dataobject.boxOrderCheckInfo.BoxOrderCheckInfoDO;
 import cn.iocoder.yudao.module.shipment.dto.OrderCheckInfoDto;
 import cn.iocoder.yudao.module.shipment.vo.box.BoxOrderSearchVO;
@@ -83,4 +84,6 @@ public interface BoxOrderCheckInfoService extends IService<BoxOrderCheckInfoDO>
     void batchRemove(BoxOrderCheckInfoRemoveReqVO removeReqVO);
 
     void orderTally(Collection<Long> orderIdList, Long shipmentId);
+
+    List<String> getOrderTagList(OrderDO orderDO) ;
 }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxOrderCheckInfo/BoxOrderCheckInfoServiceImpl.java

@@ -182,7 +182,7 @@ public class BoxOrderCheckInfoServiceImpl extends AbstractService<BoxOrderCheckI
             List<BoxPkgOrderDO> boxPkgOrderDOS = boxPkgOrderService.selectList(BoxPkgOrderDO::getPkgId, createReqVO.getPkgId());
             orderIdList = boxPkgOrderDOS.stream().map(BoxPkgOrderDO::getOrderId).collect(Collectors.toSet());
             if(orderIdList.isEmpty() || CollectionUtil.isEmpty(orderIdList)){
-                throw exception(ErrorCodeConstants.ORDER_IS_NOT_PRE_INSTALLED);
+                throw exception(ORDER_CASE_NUM_NOT_EXIST);
             }
             orderDOList = orderQueryService.getOrderList(orderIdList);
             boolean isParentOrder = false;
@@ -686,7 +686,7 @@ public class BoxOrderCheckInfoServiceImpl extends AbstractService<BoxOrderCheckI
         return orderList.get(0);
     }
 
-    private List<String> getOrderTagList(OrderDO orderDO) {
+    public List<String> getOrderTagList(OrderDO orderDO) {
         //从OrderLabel里面查找订单的箱号
         Long orderId = orderDO.getOrderId();
         OrderLabelQueryVO queryVO = new OrderLabelQueryVO();

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPkgOrder/BoxPkgOrderScanCodeVO.java

@@ -19,4 +19,10 @@ public class BoxPkgOrderScanCodeVO {
 
     @ApiModelProperty("合宝箱编号")
     private String pkgNum ;
+
+    /**
+     * 出货id
+     */
+    @ApiModelProperty("出货id")
+    private Long shipmentId;
 }