diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java index 044e7cc9c..9bf82170f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java @@ -29,6 +29,7 @@ import com.mhd.oms.domain.executionStockInOrder.repository.po.ExecutionStockInOr import com.mhd.oms.domain.executionStockInOrder.repository.todo.ExecutionStockInOrderDO; import com.mhd.oms.domain.executionStockOutOrder.entity.ExecutionStockOutOrder; import com.mhd.oms.domain.executionStockOutOrder.repository.facade.IExecutionStockOutOrderService; +import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.*; @@ -39,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.lang.reflect.Field; import java.math.BigDecimal; import java.util.ArrayList; @@ -85,7 +87,8 @@ public class ExecutionStockInOrderDomainService { // private IReceiptMaterialDetailService receiptMaterialDetailService; // @Autowired // private IShelfMaterialDetailService shelfMaterialDetailService; - + @Resource + private ReservationStockInOrderMapper stockInOrderMapper; /** * 分页查询入库单列表 */ @@ -497,6 +500,13 @@ public class ExecutionStockInOrderDomainService { StockInOrder stockInOrder = new StockInOrder(); BeanUtils.copyProperties(byId, stockInOrder,"inOrderId"); stockInOrder.setOmsStockInOrderId(String.valueOf(byId.getInOrderId())); + Long warehouseId = stockInOrder.getWarehouseId(); + Long topOrgId = stockInOrderMapper.getTopOrgId(warehouseId); + Long orgId = stockInOrderMapper.getOrgId(warehouseId); + String orgName = stockInOrderMapper.getOrgName(warehouseId); + stockInOrder.setOrganizationId(orgId); + stockInOrder.setOrganizationName(orgName); + stockInOrder.setTopOrganizationId(topOrgId); wmsServiceFeign.omsInOrderAdd(stockInOrder); String inOrderNumber = stockInOrder.getInOrderNumber(); List materialDetailList = materialDetailService.list(new QueryWrapper().lambda().eq(ExecutionInMaterialDetail::getInOrderNumber, inOrderNumber)); @@ -505,6 +515,9 @@ public class ExecutionStockInOrderDomainService { InMaterialDetail inMaterialDetail = new InMaterialDetail(); BeanUtils.copyProperties(reservationInMaterialDetail, inMaterialDetail,"materialDetailId"); inMaterialDetail.setOmsInMaterialDetail(String.valueOf(reservationInMaterialDetail.getMaterialDetailId())); + inMaterialDetail.setOrganizationId(orgId); + inMaterialDetail.setOrganizationName(orgName); + inMaterialDetail.setTopOrganizationId(topOrgId); inMaterialDetailList.add(inMaterialDetail); } wmsServiceFeign.omsInOrderAddDetail(inMaterialDetailList); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java index ed9c53e21..27e1ea97f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java @@ -37,6 +37,7 @@ import com.mhd.oms.domain.reservationInventoryAdjustmentRecord.entity.Reservatio import com.mhd.oms.domain.reservationInventoryAdjustmentRecord.repository.mapper.ReservationInventoryAdjustmentRecordMapper; import com.mhd.oms.domain.reservationMaterialInventory.entity.ReservationMaterialInventory; import com.mhd.oms.domain.reservationMaterialInventory.repository.mapper.ReservationMaterialInventoryMapper; +import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationStockInOrderMapper; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.*; @@ -93,7 +94,8 @@ public class ExecutionStockOutOrderDomainService { private ReservationInventoryAdjustmentRecordMapper inventoryAdjustmentRecordMapper; @Autowired private ReservationMaterialInventoryMapper reservationMaterialInventoryMapper; - + @Autowired + private ReservationStockInOrderMapper stockInOrderMapper; /** * 分页查询出库单列表 */ @@ -396,6 +398,13 @@ public class ExecutionStockOutOrderDomainService { ExecutionStockOutOrder byId = stockOutOrderService.getById(inOrderId); StockOutOrder stockOutOrder = new StockOutOrder(); BeanUtils.copyProperties(byId, stockOutOrder,"outOrderId"); + Long warehouseId = stockOutOrder.getWarehouseId(); + Long topOrgId = stockInOrderMapper.getTopOrgId(warehouseId); + Long orgId = stockInOrderMapper.getOrgId(warehouseId); + String orgName = stockInOrderMapper.getOrgName(warehouseId); + stockOutOrder.setOrganizationId(orgId); + stockOutOrder.setOrganizationName(orgName); + stockOutOrder.setTopOrganizationId(topOrgId); wmsServiceFeign.omsOutOrderAdd(stockOutOrder); List list = deliveryDetailsLinkService.list(new QueryWrapper().lambda().eq(ReservationDeliveryDetailsLink::getOrderNumber, byId.getOutOrderNumber())); @@ -415,6 +424,9 @@ public class ExecutionStockOutOrderDomainService { for (ExecutionOutMaterialDetail reservationOutMaterialDetail : materialDetailList) { OutMaterialDetail outMaterialDetail = new OutMaterialDetail(); BeanUtils.copyProperties(reservationOutMaterialDetail, outMaterialDetail,"materialDetailId"); + outMaterialDetail.setOrganizationId(orgId); + outMaterialDetail.setOrganizationName(orgName); + outMaterialDetail.setTopOrganizationId(topOrgId); outMaterialDetailList.add(outMaterialDetail); } wmsServiceFeign.omsOutOrderAddDetail(outMaterialDetailList);