Commit e275c3aa authored by zhengyi's avatar zhengyi

Merge branch 'release-fix' into release

parents ff9f902a e4b92112
......@@ -390,7 +390,7 @@ public interface OrderBusinessService extends IService<OrderDO> {
* @param orderItemDOList 订单商品项列表
* @param type 类型 : 1 新增 2 修改 3 实测入仓信息 4 合单 5 拆单 6 处理未报价异常 7 特价申请 8 订单货值修改
* 9 处理重泡货异常 10 已入仓订单修改重订价 11 处理渠道异常 12 处理单询异常 13 处理超重异常 14 批量加价 15 完成入仓
* 16 分拣完成锁定价格 20 强制重订价格 30 空运订单每日定时更新价格 40 订单异常处理完成更新计价 50 更新订单优惠信息
* 16 分拣完成锁定价格 17 分拣反审解除锁定价格 18 出货入仓修改 20 强制重订价格 30 空运订单每日定时更新价格 40 订单异常处理完成更新计价 50 更新订单优惠信息
**/
void costCalculation(String userId, OrderDO orderDO, Long consignorCustomerId, Long consigneeCustomerId,
Long consignorCustomerContactsId, Long consigneeCustomerContactsId,
......
......@@ -70,6 +70,14 @@ public interface OrderService extends IService<OrderDO> {
*/
OrderDO orderInWarehouse(@Valid OrderWarehouseInVO orderWarehouseInVO);
/**
* 出货订单入仓
*
* @param orderWarehouseInVO 入仓信息
*/
OrderDO shipmentOrderInWarehouse(@Valid OrderWarehouseInVO orderWarehouseInVO);
/**
* 合单-创建合并订单
*
......
......@@ -3298,8 +3298,8 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
* 5 拆单 6 处理未报价异常 7 特价申请 8 订单货值修改
* 9 处理重泡货异常 10 已入仓订单修改重订价 11
* 处理渠道异常 12 处理单询异常 13 处理超重异常
* 14 批量加价 15 完成入仓
* 16 分拣完成锁定价格 17 分拣反审解除锁定价格
* 14 批量加价 15 完成入仓 16 分拣完成锁定价格
* 17 分拣反审解除锁定价格 18 出货入仓修改
* 20 强制重订价格 30 空运订单每日定时更新价格
* 40 订单异常处理完成更新计价
* 50 更新订单优惠信息
......
......@@ -3604,6 +3604,50 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
@Override
public OrderDO shipmentOrderInWarehouse(OrderWarehouseInVO orderWarehouseInVO) {
// TODO 订单入仓信息录入
OrderDO orderDO = orderMapper.selectById(orderWarehouseInVO.getOrderId());
if (Objects.isNull(orderDO)) {
throw exception(ORDER_NOT_EXISTS);
}
// 校验是否有已核销的应收单,如果有,则不能再次入仓修改
receivableService.verificationReceivableIsWriteOff(orderDO.getOrderId(), null);
List<OrderItemDO> orderItemDOList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderDO.getOrderId()));
List<OrderItemInWarehouseVO> orderItemInWarehouseVOList =
orderWarehouseInVO.getOrderItemInWarehouseVOList();
if (CollectionUtil.isNotEmpty(orderItemInWarehouseVOList) && CollectionUtil.isNotEmpty(orderItemDOList)) {
orderItemInWarehouseVOList.forEach(vo -> {
for (OrderItemDO orderItemDO : orderItemDOList) {
if (null != vo.getOrderItemId() && Objects.equals(orderItemDO.getOrderItemId(), vo.getOrderItemId()) && Objects.equals(orderItemDO.getProdId(), vo.getProdId())) {
if (null != vo.getProdType()) {
orderItemDO.setProdType(vo.getProdType());
}
if (null != vo.getBrandType()) {
orderItemDO.setBrandType(vo.getBrandType());
}
if (StringUtils.isNotBlank(vo.getProdTitleZh())) {
orderItemDO.setProdTitleZh(vo.getProdTitleZh());
}
if (StringUtils.isNotBlank(vo.getProdTitleEn())) {
orderItemDO.setProdTitleEn(vo.getProdTitleEn());
}
}
}
});
}
OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
orderBusinessService.costCalculation(String.valueOf(SecurityFrameworkUtils.getLoginUserId()), orderDO, orderConsignorDO.getCustomerId(),
orderConsigneeDO.getCustomerId(), orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(),
orderItemDOList, 18);
return orderDO;
}
@Override
public void mergeOrder(@Valid OrderDO orderDO) {
if (Objects.isNull(orderDO)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment