fix(oms):修改导入的单号
This commit is contained in:
+8
-3
@@ -219,7 +219,10 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
|
|||||||
}
|
}
|
||||||
|
|
||||||
ReservationStockOutOrderDO reservationStockOutOrderDO = new ReservationStockOutOrderDO();
|
ReservationStockOutOrderDO reservationStockOutOrderDO = new ReservationStockOutOrderDO();
|
||||||
reservationStockOutOrderDO.setOutOrderNumber(OrderSequence.getOrderCode("CK"));
|
// 生成出库业务单号
|
||||||
|
String orderNumber = reservationStockOutOrderApplicationService.generateReserveOrderNumber();
|
||||||
|
reservationStockOutOrderDO.setOutOrderNumber(orderNumber);
|
||||||
|
reservationStockOutOrderDO.setBusinessOrderNo(orderNumber);
|
||||||
// 货主信息:有货品明细时从解析结果取,无货品明细时从登录用户取
|
// 货主信息:有货品明细时从解析结果取,无货品明细时从登录用户取
|
||||||
if (!shipperIds.isEmpty()) {
|
if (!shipperIds.isEmpty()) {
|
||||||
reservationStockOutOrderDO.setShipperId((Long) shipperIds.get(0).get("shipperId"));
|
reservationStockOutOrderDO.setShipperId((Long) shipperIds.get(0).get("shipperId"));
|
||||||
@@ -376,7 +379,10 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
ReservationStockInOrderDO reservationStockInOrderDO = new ReservationStockInOrderDO();
|
ReservationStockInOrderDO reservationStockInOrderDO = new ReservationStockInOrderDO();
|
||||||
reservationStockInOrderDO.setInOrderNumber(OrderSequence.getOrderCode("RK"));
|
// 生成业务单号
|
||||||
|
String orderNumber = reservationStockInOrderDomainService.generateReserveOrderNumber();
|
||||||
|
reservationStockInOrderDO.setInOrderNumber(orderNumber);
|
||||||
|
reservationStockInOrderDO.setBusinessOrderNo(orderNumber);
|
||||||
reservationStockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
|
reservationStockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
|
||||||
reservationStockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
|
reservationStockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
|
||||||
reservationStockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
|
reservationStockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
|
||||||
@@ -402,7 +408,6 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
|
|||||||
reservationStockInOrderDO.setWarehouseDate(stockInHeader.getStockInDate());
|
reservationStockInOrderDO.setWarehouseDate(stockInHeader.getStockInDate());
|
||||||
reservationStockInOrderDO.setStorageTime(stockInHeader.getStockInDate());
|
reservationStockInOrderDO.setStorageTime(stockInHeader.getStockInDate());
|
||||||
reservationStockInOrderDO.setExpectTime(stockInHeader.getStockInDate());
|
reservationStockInOrderDO.setExpectTime(stockInHeader.getStockInDate());
|
||||||
reservationStockInOrderDO.setBusinessOrderNo(stockInHeader.getOrderNo());
|
|
||||||
reservationStockInOrderDO.setReservationOrderSource("数据导入");
|
reservationStockInOrderDO.setReservationOrderSource("数据导入");
|
||||||
List<ReservationInMaterialDetailDO> reservationInMaterialDetailDOList = new ArrayList<>();
|
List<ReservationInMaterialDetailDO> reservationInMaterialDetailDOList = new ArrayList<>();
|
||||||
int index = 1;
|
int index = 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user