异步调用oms修改库存;
This commit is contained in:
王奎兴
+3
@@ -225,6 +225,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
|
||||
DeliveryHeader deliveryHeader = deliveryDataDTO.getDeliveryHeader();
|
||||
reservationStockOutOrderDO.setTotalAmount(deliveryHeader.getSubtotalAmount());
|
||||
reservationStockOutOrderDO.setRoute(deliveryHeader.getDeliveryLineNo());
|
||||
reservationStockOutOrderDO.setReservationOrderSource("数据导入");
|
||||
reservationStockOutOrderDO.setOutboundDate(deliveryHeader.getDeliveryDate());
|
||||
int index = 1;
|
||||
List<ReservationOutMaterialDetailDO> reservationOutMaterialDetailDOList = new ArrayList<>();
|
||||
@@ -355,7 +356,9 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
|
||||
reservationStockInOrderDO.setShipperCode((String) shipperIds.get(0).get("shipperCode"));
|
||||
StockInHeader stockInHeader = resultDTO.getStockInHeader();
|
||||
reservationStockInOrderDO.setWarehouseDate(stockInHeader.getStockInDate());
|
||||
reservationStockInOrderDO.setStorageTime(stockInHeader.getStockInDate());
|
||||
reservationStockInOrderDO.setBusinessOrderNo(stockInHeader.getOrderNo());
|
||||
reservationStockInOrderDO.setReservationOrderSource("数据导入");
|
||||
List<ReservationInMaterialDetailDO> reservationInMaterialDetailDOList = new ArrayList<>();
|
||||
int index = 1;
|
||||
for (StockInProductDetail stockInProductDetail : productDetailList) {
|
||||
|
||||
+1
-1
@@ -208,7 +208,7 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
|
||||
private Date closeTime;
|
||||
|
||||
@ApiModelProperty("入库单来源: 1-正常录入 2-通知单生成 3-无单收货")
|
||||
@Excel(name = "入库单来源: 1-正常录入 2-通知单生成 3-无单收货")
|
||||
@Excel(name = "入库单来源: 1-正常录入 2-通知单生成 3-无单收货4-数据导入")
|
||||
private Integer orderSource;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
|
||||
+3
-1
@@ -60,7 +60,9 @@ public class ReserveStockInOrder extends BaseVOEntity {
|
||||
@ApiModelProperty("入库单号")
|
||||
@Excel(name = "入库单号")
|
||||
private String inOrderNumber;
|
||||
|
||||
@ApiModelProperty("预约数量")
|
||||
@Excel(name = "预约数量")
|
||||
private BigDecimal reserveQuantity;
|
||||
@ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
|
||||
@Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
|
||||
private Integer status;
|
||||
|
||||
+3
-1
@@ -361,7 +361,9 @@ public class ReserveStockInOrderPO extends BaseVOEntity {
|
||||
@ApiModelProperty("业务类型")
|
||||
@Excel(name = "业务类型")
|
||||
private String businessType;
|
||||
|
||||
@ApiModelProperty("预约数量")
|
||||
@Excel(name = "预约数量")
|
||||
private BigDecimal reserveQuantity;
|
||||
@ApiModelProperty("制单人")
|
||||
@Excel(name = "制单人")
|
||||
private String documentCreator;
|
||||
|
||||
+4
@@ -156,6 +156,10 @@ public class ReserveStockInOrderDO extends BaseVOEntity {
|
||||
@Excel(name = "入库数量")
|
||||
private BigDecimal inQuantity;
|
||||
|
||||
@ApiModelProperty("预约数量")
|
||||
@Excel(name = "预约数量")
|
||||
private BigDecimal reserveQuantity;
|
||||
|
||||
@ApiModelProperty("净重 单位：千克")
|
||||
@Excel(name = "净重 单位：千克")
|
||||
private BigDecimal weightLimit;
|
||||
|
||||
+3
@@ -57,6 +57,9 @@ public class ReserveStockInOrderDTO extends ReserveStockInOrderBaseDTO {
|
||||
@ApiModelProperty("入库单号")
|
||||
@Excel(name = "入库单号")
|
||||
private String inOrderNumber;
|
||||
@ApiModelProperty("预约数量")
|
||||
@Excel(name = "预约数量")
|
||||
private BigDecimal reserveQuantity;
|
||||
|
||||
@ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库")
|
||||
@Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库")
|
||||
|
||||
+2
@@ -112,6 +112,8 @@ public class ReserveStockInOrderDomainService {
|
||||
// //统计总计划数
|
||||
BigDecimal quantity = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
stockInOrderDO.setQuantity(quantity);
|
||||
BigDecimal reserveQuantity = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getReserveQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
stockInOrderDO.setReserveQuantity(reserveQuantity);
|
||||
//统计总重量
|
||||
BigDecimal weightLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getWeightLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
stockInOrderDO.setWeightLimit(weightLimit);
|
||||
|
||||
@@ -96,6 +96,7 @@
|
||||
<result property="customerId" column="CUSTOMER_ID" />
|
||||
<result property="customerName" column="CUSTOMER_NAME" />
|
||||
<result property="customerCode" column="CUSTOMER_CODE" />
|
||||
<result property="reserveQuantity" column="RESERVE_QUANTITY" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -103,7 +104,7 @@
|
||||
a.in_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.notice_number, a.in_order_number, a.status,
|
||||
a.audit_status, a.audit_remark, a.audit_by, a.audit_by_name, a.audit_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_code,
|
||||
a.shipper_name, a.order_type_code, a.order_type_name, a.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number,
|
||||
a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,a.business_order_no,
|
||||
a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,a.business_order_no,a.reserve_quantity,
|
||||
-- 计划入库数量：入库明细表 in_material_detail 的 quantity 汇总
|
||||
<!-- (select ifnull(sum(imd.quantity), 0)-->
|
||||
<!-- from in_material_detail imd-->
|
||||
|
||||
Reference in New Issue
Block a user