|
@ -1,6 +1,8 @@ |
|
|
package com.ruoyi.warehouse.service.impl; |
|
|
package com.ruoyi.warehouse.service.impl; |
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
import java.math.BigDecimal; |
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.Arrays; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Optional; |
|
|
import java.util.Optional; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
@ -1829,7 +1831,18 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS |
|
|
// 新增采购入库库存历史记录
|
|
|
// 新增采购入库库存历史记录
|
|
|
String purchasePlanCode = purchaseOrderMapper.selectPurchasePlanCodeByCode(correlationCode); |
|
|
String purchasePlanCode = purchaseOrderMapper.selectPurchasePlanCodeByCode(correlationCode); |
|
|
|
|
|
|
|
|
PurchasePlan purchasePlan = purchasePlanMapper.selectPurchasePlanByPlanCode(purchasePlanCode); |
|
|
List<String> purchasePlanCodes = new ArrayList<>(); |
|
|
|
|
|
if (StringUtils.isEmpty(purchasePlanCode)){ |
|
|
|
|
|
throw new BusinessException("找不到与采购单号关联的采购计划号"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(purchasePlanCode)){ |
|
|
|
|
|
String[] splitPurchasePlanCode = purchasePlanCode.split(","); |
|
|
|
|
|
purchasePlanCodes = Arrays.asList(splitPurchasePlanCode); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
List<PurchasePlan> purchasePlans = purchasePlanMapper.selectPurchaseOrderByPlanCodeList(purchasePlanCodes); |
|
|
|
|
|
for (PurchasePlan purchasePlan : purchasePlans) { |
|
|
if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单
|
|
|
if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单
|
|
|
List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); |
|
|
List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); |
|
|
for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { |
|
|
for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { |
|
@ -1931,7 +1944,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
}else if(warehouseStorageType.equals("5")){//新增生产入库库存历史记录
|
|
|
}else if(warehouseStorageType.equals("5")){//新增生产入库库存历史记录
|
|
|
|
|
|
|
|
|
WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); |
|
|
WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); |
|
|