|
|
@@ -1351,8 +1351,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
stockOne.setBalanceQuantity(stockOne.getBalanceQuantity().add(item.getSendNum()));
|
|
|
stockOne.setBalanceQuantityFinancing(stockOne.getBalanceQuantityFinancing().add(item.getSendNumFinancing()));
|
|
|
stockOne.setBalanceQuantityHave(stockOne.getBalanceQuantityHave().add(item.getSendNumHave()));
|
|
|
-// item.setSendNumHave(new BigDecimal("0"));
|
|
|
-// item.setSendNumFinancing(new BigDecimal("0"));
|
|
|
stockOne.setStoreInventory(stockOne.getBalanceQuantity());
|
|
|
BigDecimal inventoryAmount = item.getSendNum().multiply(stockOne.getInventoryCostPrice());
|
|
|
BigDecimal rebateInventoryAmount = item.getSendNum().multiply(stockOne.getRebatePrice());
|
|
|
@@ -1360,10 +1358,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().add(rebateInventoryAmount));
|
|
|
stockOne.setVersion(stockOne.getVersion());
|
|
|
pjStockDescArrayList.add(stockOne);
|
|
|
- /*R res = iStockDescService.updateByIdNew(stockOne);
|
|
|
- if (!res.isSuccess()) {
|
|
|
- throw new RuntimeException(res.getMsg());
|
|
|
- }*/
|
|
|
} else {
|
|
|
throw new RuntimeException("未查到库存账");
|
|
|
}
|
|
|
@@ -1429,244 +1423,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
throw new RuntimeException("数据异常请联系管理员");
|
|
|
}
|
|
|
|
|
|
- /*if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
|
|
|
- List<ShipItemsRecord> recordList = shipItemsRecordService.list(new LambdaQueryWrapper<ShipItemsRecord>()
|
|
|
- .eq(ShipItemsRecord::getIsDeleted, 0)
|
|
|
- .eq(ShipItemsRecord::getTenantId, AuthUtil.getTenantId())
|
|
|
- .eq(ShipItemsRecord::getPid, ship.getId()));
|
|
|
- if (!recordList.isEmpty()) {
|
|
|
- shipItemsRecordService.removeByIds(recordList.stream().map(ShipItemsRecord::getId).collect(Collectors.toList()));
|
|
|
- }
|
|
|
- String firstProportion = sysClient.getParamService("first.month.proportion");
|
|
|
- String secondProportion = sysClient.getParamService("second.month.proportion");
|
|
|
- PjpfFunding pjpfFunding = pjpfFundingService.getOne(new LambdaQueryWrapper<PjpfFunding>()
|
|
|
- .eq(PjpfFunding::getTenantId, AuthUtil.getTenantId())
|
|
|
- .eq(PjpfFunding::getIsDeleted, 0));
|
|
|
- if (pjpfFunding == null) {
|
|
|
- throw new RuntimeException("未找到融资总账");
|
|
|
- }
|
|
|
- List<String> srcFinancingList = itemsList.stream().filter(e -> ObjectUtils.isNotNull(financingBrand) && financingBrand.contains(e.getBrandName()))
|
|
|
- .map(PjShipItems::getSrcFinancing).filter(Objects::nonNull).distinct().collect(Collectors.toList());
|
|
|
- List<FinancingShipItemDto> financingShipItemDtoList = new ArrayList<>();
|
|
|
- for (String item : srcFinancingList) {
|
|
|
- ObjectMapper mapper = new ObjectMapper();
|
|
|
- try {
|
|
|
- List<FinancingShipItemDto> entities = mapper.readValue(item, new TypeReference<List<FinancingShipItemDto>>() {
|
|
|
- });
|
|
|
- if (!entities.isEmpty()) {
|
|
|
- financingShipItemDtoList.addAll(entities);
|
|
|
- }
|
|
|
- } catch (JsonProcessingException e) {
|
|
|
- throw new RuntimeException(e);
|
|
|
- }
|
|
|
- }
|
|
|
- List<PjOrder> orderList = orderMapper.selectList(new LambdaQueryWrapper<PjOrder>()
|
|
|
- .eq(PjOrder::getTenantId, AuthUtil.getTenantId())
|
|
|
- .eq(PjOrder::getIsDeleted, 0)
|
|
|
- .eq(PjOrder::getWhetherFinancing, "1")
|
|
|
- .eq(PjOrder::getBsType, "RZCG")
|
|
|
- .orderByAsc(PjOrder::getBusinesDate)
|
|
|
- );
|
|
|
- List<Long> ordIds = orderList.stream().map(PjOrder::getId).collect(Collectors.toList());
|
|
|
- List<PjOrderItems> orderItemsList = orderItemsService.list(new LambdaQueryWrapper<PjOrderItems>()
|
|
|
- .eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
|
|
|
- .eq(PjOrderItems::getIsDeleted, 0)
|
|
|
- .eq(PjOrderItems::getBizType, "RZCG")
|
|
|
- .in(PjOrderItems::getPid, ordIds)
|
|
|
- .in(PjOrderItems::getId, financingShipItemDtoList.stream().map(FinancingShipItemDto::getId).filter(Objects::nonNull)
|
|
|
- .distinct().collect(Collectors.toList()))
|
|
|
- .orderByAsc(PjOrderItems::getCreateTime)
|
|
|
- );
|
|
|
- for (PjOrderItems items : orderItemsList) {
|
|
|
- FinancingShipItemDto pjOrderItems = financingShipItemDtoList.stream().filter(e -> e.getId().equals(items.getId())).findFirst().orElse(null);
|
|
|
- if (pjOrderItems != null) {
|
|
|
- items.setOutGoodsTotalShipNum(items.getOutGoodsTotalShipNum().subtract(pjOrderItems.getNum()));
|
|
|
- items.setThisOutGoodsTotalShipNum(pjOrderItems.getNum());
|
|
|
- items.setOutGoodsTotalShipAmount(items.getOutGoodsTotalShipAmount().subtract(pjOrderItems.getAmount()));
|
|
|
- items.setThisOutGoodsTotalShipAmount(pjOrderItems.getAmount());
|
|
|
- }
|
|
|
- }
|
|
|
- orderItemsService.updateBatchById(orderItemsList);
|
|
|
- BigDecimal amount = itemsList.stream().filter(e -> ObjectUtils.isNotNull(financingBrand) && financingBrand.contains(e.getBrandName()))
|
|
|
- .map(PjShipItems::getCostprie).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
- pjpfFunding.setAvailableAmount(pjpfFunding.getAvailableAmount().add(amount));
|
|
|
- BigDecimal bondAmountSum = new BigDecimal("0.00");
|
|
|
- BigDecimal fundingAmountSum = new BigDecimal("0.00");
|
|
|
- BigDecimal availableAmountSum = new BigDecimal("0.00");
|
|
|
- List<Long> orderIdsList = financingShipItemDtoList.stream().map(FinancingShipItemDto::getPid).filter(Objects::nonNull)
|
|
|
- .distinct().collect(Collectors.toList());
|
|
|
- for (PjOrder items : orderList) {
|
|
|
- List<PjOrderItems> pjOrderItems = orderItemsList.stream().filter(e -> items.getId().equals(e.getPid()))
|
|
|
- .collect(Collectors.toList());
|
|
|
- if (!pjOrderItems.isEmpty()) {
|
|
|
- items.setOutGoodsTotalShipNum(items.getOutGoodsTotalShipNum().subtract(pjOrderItems.stream().map(PjOrderItems::getThisOutGoodsTotalShipNum)
|
|
|
- .reduce(BigDecimal.ZERO, BigDecimal::add)));
|
|
|
- items.setOutGoodsTotalShipAmount(items.getOutGoodsTotalShipAmount().subtract(pjOrderItems.stream().map(PjOrderItems::getThisOutGoodsTotalShipAmount)
|
|
|
- .reduce(BigDecimal.ZERO, BigDecimal::add)));
|
|
|
- }
|
|
|
- if (orderIdsList.contains(items.getId())) {
|
|
|
- if (!"1".equals(items.getWhetherRedeem())) {
|
|
|
- Date currentDate = new Date();
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.setTime(currentDate);
|
|
|
- calendar.add(Calendar.DAY_OF_MONTH, -60);
|
|
|
- Date thirtyDayAgo = calendar.getTime();
|
|
|
-
|
|
|
- BigDecimal subAmount = items.getGoodsTotalShipAmount().subtract(items.getOutGoodsTotalShipAmount());
|
|
|
- if (new BigDecimal("0.00").compareTo(subAmount) == 0) {
|
|
|
- subAmount = items.getGoodsTotalShipAmount();
|
|
|
- }
|
|
|
- List<Long> itemIdList = financingShipItemDtoList.stream().filter(e -> e.getPid().equals(items.getId())).map(FinancingShipItemDto::getItemId).collect(Collectors.toList());
|
|
|
- List<PjShipItems> shipItems = new ArrayList<>();
|
|
|
- if (!itemIdList.isEmpty()) {
|
|
|
- shipItems = itemsList.stream().filter(e -> itemIdList.contains(e.getId())).collect(Collectors.toList());
|
|
|
- }
|
|
|
- if (currentDate.compareTo(thirtyDayAgo) > 0) {
|
|
|
- String secondProportionOld = "";
|
|
|
- if (!shipItems.isEmpty() && ObjectUtils.isNotNull(shipItems.get(0).getProportion())) {
|
|
|
- secondProportionOld = shipItems.get(0).getProportion();
|
|
|
- } else {
|
|
|
- throw new RuntimeException("未找到出库融资比例");
|
|
|
- }
|
|
|
- String[] arr = secondProportionOld.split(":");
|
|
|
- BigDecimal bondAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[0]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- BigDecimal fundingAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[1]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- if (bondAmount.compareTo(items.getBondAmount()) > 0) {
|
|
|
- BigDecimal availableAmount = bondAmount.subtract(items.getBondAmount());
|
|
|
- items.setBondAmount(bondAmount);
|
|
|
- bondAmountSum = bondAmountSum.add(bondAmount);
|
|
|
- availableAmountSum = availableAmountSum.subtract(availableAmount);
|
|
|
- }
|
|
|
- if (fundingAmount.compareTo(items.getFundingAmount()) > 0) {
|
|
|
- items.setFundingAmount(fundingAmount);
|
|
|
- fundingAmountSum = fundingAmountSum.add(fundingAmount);
|
|
|
- }
|
|
|
- } else {
|
|
|
- String firstProportionOld = "";
|
|
|
- if (!shipItems.isEmpty() && ObjectUtils.isNotNull(shipItems.get(0).getProportion())) {
|
|
|
- firstProportionOld = shipItems.get(0).getProportion();
|
|
|
- } else {
|
|
|
- throw new RuntimeException("未找到出库融资比例");
|
|
|
- }
|
|
|
- String[] arr = firstProportionOld.split(":");
|
|
|
- BigDecimal bondAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[0]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- BigDecimal fundingAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[1]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- if (bondAmount.compareTo(items.getBondAmount()) > 0) {
|
|
|
- BigDecimal availableAmount = bondAmount.subtract(items.getBondAmount());
|
|
|
- items.setBondAmount(bondAmount);
|
|
|
- bondAmountSum = bondAmountSum.add(bondAmount);
|
|
|
- availableAmountSum = availableAmountSum.add(availableAmount);
|
|
|
- }
|
|
|
- if (fundingAmount.compareTo(items.getFundingAmount()) > 0) {
|
|
|
- items.setFundingAmount(fundingAmount);
|
|
|
- fundingAmountSum = fundingAmountSum.add(fundingAmount);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (!"1".equals(items.getWhetherRedeem())) {
|
|
|
- Date currentDate = new Date();
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.setTime(currentDate);
|
|
|
- calendar.add(Calendar.DAY_OF_MONTH, -60);
|
|
|
- Date thirtyDayAgo = calendar.getTime();
|
|
|
- BigDecimal subAmount = items.getGoodsTotalShipAmount().subtract(items.getOutGoodsTotalShipAmount());
|
|
|
- if (new BigDecimal("0.00").compareTo(subAmount) == 0) {
|
|
|
- subAmount = items.getGoodsTotalShipAmount();
|
|
|
- }
|
|
|
- List<Long> itemIdList = financingShipItemDtoList.stream().filter(e -> e.getPid().equals(items.getId())).map(FinancingShipItemDto::getId).collect(Collectors.toList());
|
|
|
- List<PjShipItems> shipItems = new ArrayList<>();
|
|
|
- if (!itemIdList.isEmpty()) {
|
|
|
- shipItems = itemsList.stream().filter(e -> itemIdList.contains(e.getId())).collect(Collectors.toList());
|
|
|
- }
|
|
|
- if (currentDate.compareTo(thirtyDayAgo) > 0) {
|
|
|
- if (!shipItems.isEmpty()) {
|
|
|
- for (PjShipItems shipItems1 : itemsList) {
|
|
|
- if (ObjectUtils.isNotNull(financingBrand) && financingBrand.contains(shipItems1.getBrandName())) {
|
|
|
- shipItems1.setProportion(firstProportion);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- String[] arr = firstProportion.split(":");
|
|
|
- BigDecimal bondAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[0]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- BigDecimal fundingAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[1]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- if (bondAmount.compareTo(items.getBondAmount()) <= 0) {
|
|
|
- BigDecimal availableAmount = items.getBondAmount().subtract(bondAmount);
|
|
|
- items.setBondAmount(bondAmount);
|
|
|
- bondAmountSum = bondAmountSum.add(bondAmount);
|
|
|
- availableAmountSum = availableAmountSum.add(availableAmount);
|
|
|
- }
|
|
|
- if (fundingAmount.compareTo(items.getFundingAmount()) <= 0) {
|
|
|
- items.setFundingAmount(fundingAmount);
|
|
|
- fundingAmountSum = fundingAmountSum.add(fundingAmount);
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (!shipItems.isEmpty()) {
|
|
|
- for (PjShipItems shipItems1 : shipItems) {
|
|
|
- if (ObjectUtils.isNotNull(financingBrand) && financingBrand.contains(shipItems1.getBrandName())) {
|
|
|
- shipItems1.setProportion(secondProportion);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- String[] arr = secondProportion.split(":");
|
|
|
- BigDecimal bondAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[0]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- BigDecimal fundingAmount = subAmount.multiply(
|
|
|
- (new BigDecimal(arr[1]).divide(new BigDecimal("10"), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP)));
|
|
|
- if (bondAmount.compareTo(items.getBondAmount()) <= 0) {
|
|
|
- BigDecimal availableAmount = items.getBondAmount().subtract(bondAmount);
|
|
|
- items.setBondAmount(bondAmount);
|
|
|
- bondAmountSum = bondAmountSum.add(bondAmount);
|
|
|
- availableAmountSum = availableAmountSum.add(availableAmount);
|
|
|
- }
|
|
|
- if (fundingAmount.compareTo(items.getFundingAmount()) <= 0) {
|
|
|
- items.setFundingAmount(fundingAmount);
|
|
|
- fundingAmountSum = fundingAmountSum.add(fundingAmount);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- orderMapper.updateById(items);
|
|
|
- }
|
|
|
- pjpfFunding.setAvailableAmount(pjpfFunding.getAvailableAmount().add(availableAmountSum));
|
|
|
- pjpfFunding.setSurplusFundingAmount(fundingAmountSum);
|
|
|
- pjpfFunding.setPaidAlreadyBondAmount(bondAmountSum);
|
|
|
- pjpfFunding.setBondAmount(bondAmountSum);
|
|
|
- pjpfFunding.setAmount(pjpfFunding.getSurplusFundingAmount().add(pjpfFunding.getBondAmount()));
|
|
|
- pjpfFunding.setFundingAmount(pjpfFunding.getFundingAmount().subtract(amount.add(availableAmountSum)));
|
|
|
- pjpfFunding.setProportion(pjpfFunding.getBondAmount().divide(pjpfFunding.getAmount(), MathContext.DECIMAL32)
|
|
|
- .setScale(2, RoundingMode.HALF_UP));
|
|
|
- pjpfFundingService.updateById(pjpfFunding);
|
|
|
- PjpfFundingItem item = new PjpfFundingItem();
|
|
|
- item.setPid(pjpfFunding.getId());
|
|
|
- item.setTenantId(AuthUtil.getTenantId());
|
|
|
- item.setCreateTime(new Date());
|
|
|
- item.setCreateUser(AuthUtil.getUserId());
|
|
|
- item.setCreateUserName(AuthUtil.getUserName());
|
|
|
- item.setCreateDept(pjpfFunding.getCreateDept());
|
|
|
- item.setCreateDeptName(pjpfFunding.getCreateDeptName());
|
|
|
- item.setType("撤销出库");
|
|
|
- item.setSrcId(ship.getId());
|
|
|
- item.setSrcNo(ship.getBillno());
|
|
|
- item.setAmount(amount);
|
|
|
- item.setFundingAmount(amount.add(availableAmountSum));
|
|
|
- item.setBondAmount(availableAmountSum.abs());
|
|
|
- pjpfFundingItemService.save(item);
|
|
|
- }*/
|
|
|
if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
|
|
|
BigDecimal sendNumFinancing = itemsList.stream().map(PjShipItems::getSendNumFinancing).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
if (new BigDecimal("0.00").compareTo(sendNumFinancing) != 0) {
|
|
|
@@ -2080,31 +1836,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public R warehousingComplete(PjShip ship) {
|
|
|
|
|
|
- /*if (ObjectUtils.isNotNull(ship.getStorageId())) {
|
|
|
- String status = sysClient.getParamService("whether.financing");
|
|
|
- PjStorageDesc storageDesc = storageDescMapper.selectById(ship.getStorageId());
|
|
|
- if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
|
|
|
- if (ship.getBizTypeName().equals(OrderTypeEnum.TKSHGD.getType())) {
|
|
|
- if (storageDesc != null && "1".equals(storageDesc.getWhetherFinancing())) {
|
|
|
- throw new RuntimeException("请选择自有库");
|
|
|
- }
|
|
|
- } else {
|
|
|
- if ("1".equals(ship.getWhetherFinancing())) {
|
|
|
- if ("0".equals(storageDesc.getWhetherFinancing())) {
|
|
|
- throw new RuntimeException("请选择融资库");
|
|
|
- }
|
|
|
- } else {
|
|
|
- if ("1".equals(storageDesc.getWhetherFinancing())) {
|
|
|
- throw new RuntimeException("请选择自有库");
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- if ("1".equals(ship.getWhetherFinancing())) {
|
|
|
- throw new RuntimeException("请选择自有库");
|
|
|
- }
|
|
|
- }
|
|
|
- }*/
|
|
|
if (ship.getId() == null) {
|
|
|
// 获取系统编号
|
|
|
String billNo = serialService.getBillNo(OrderTypeEnum.SHGD.getType(), OrderTypeEnum.SHGD.getType(), OrderTypeEnum.SHGD.getType());
|
|
|
@@ -2146,10 +1877,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
.eq(PjStockDesc::getIsDeleted, 0)
|
|
|
.eq(PjStockDesc::getSalesCompanyId, ship.getSalesCompanyId())
|
|
|
.in(PjStockDesc::getGoodsId, goodIds);
|
|
|
-// if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
|
|
|
- /*if (ObjectUtils.isNotNull(ship.getWhetherFinancing()) && "1".equals(ship.getWhetherFinancing())) {
|
|
|
- stockLambdaQueryWrapper.apply("find_in_set(po_no,'" + poNo + "')");
|
|
|
- }*/
|
|
|
List<PjStockDesc> pjStockDescList = iStockDescService.list(stockLambdaQueryWrapper);
|
|
|
List<PjGoodsType> pjGoodsTypeList = goodsTypeMapper.selectList(new LambdaQueryWrapper<PjGoodsType>()
|
|
|
.eq(PjGoodsType::getTenantId, AuthUtil.getTenantId())
|
|
|
@@ -2754,15 +2481,14 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
|
|
|
BigDecimal inventoryAmount = item.getSendNum().multiply(item.getPrice());
|
|
|
stockOne.setInventoryAmount(stockOne.getInventoryAmount().add(inventoryAmount));
|
|
|
- stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
+// stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
|
|
BigDecimal RebateInventoryAmount = item.getSendNum().multiply(item.getRebatePrice());
|
|
|
stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().add(RebateInventoryAmount));
|
|
|
- stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
+// stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
|
|
pjStockDescArrayList.add(stockOne);
|
|
|
}
|
|
|
- /* ----------------------修改上架库存---------------------- */
|
|
|
//查询所有该商品的库存
|
|
|
List<PjStockDesc> stockDescList = pjStockDescList.stream().filter(e -> e.getGoodsId().equals(goodsDesc.getId())).collect(Collectors.toList());
|
|
|
//库存总数量
|
|
|
@@ -2776,7 +2502,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
pjProductLaunchList.add(e);
|
|
|
}
|
|
|
}
|
|
|
- /* ----------------------修改上架库存---------------------- */
|
|
|
}
|
|
|
shipItemsService.saveOrUpdateBatch(shipItemsList);
|
|
|
iStockDescService.saveOrUpdateBatch(pjStockDescArrayList);
|
|
|
@@ -3482,10 +3207,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
stockOneR.setStoreInventory(stockOneR.getBalanceQuantity());
|
|
|
stockOneR.setInventoryAmount(stockOneR.getInventoryAmount().add(orderItems.getGoodsNum()
|
|
|
.multiply(stockOneC.getInventoryCostPrice())));
|
|
|
- stockOneR.setInventoryCostPrice(stockOneR.getInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
+// stockOneR.setInventoryCostPrice(stockOneR.getInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
stockOneR.setRebateInventoryAmount(stockOneR.getRebateInventoryAmount().add(orderItems.getGoodsNum()
|
|
|
.multiply(stockOneC.getRebatePrice())));
|
|
|
- stockOneR.setRebatePrice(stockOneR.getRebateInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
+// stockOneR.setRebatePrice(stockOneR.getRebateInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
|
|
|
stockOneR.setVersion(stockOneR.getVersion());
|
|
|
pjStockDescList.add(stockOneR);
|
|
|
} else {
|
|
|
@@ -4072,10 +3797,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
stockOne.setInventoryAmount(stockOne.getInventoryAmount().subtract(inventoryAmount));
|
|
|
stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().subtract(rebateInventoryAmount));
|
|
|
stockOne.setVersion(stockOne.getVersion());
|
|
|
- if (stockOne.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
|
|
|
+ /*if (stockOne.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
|
|
|
stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
- }
|
|
|
+ }*/
|
|
|
pjStockDescArrayList.add(stockOne);
|
|
|
} else {
|
|
|
System.err.println("商品：" + goodsDesc.getCname());
|
|
|
@@ -4518,10 +4243,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
stockOne.setInventoryAmount(stockOne.getInventoryAmount().add(inventoryAmount));
|
|
|
stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().add(rebateInventoryAmount));
|
|
|
stockOne.setVersion(stockOne.getVersion());
|
|
|
- if (stockOne.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
|
|
|
+ /*if (stockOne.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
|
|
|
stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
- }
|
|
|
+ }*/
|
|
|
pjStockDescArrayList.add(stockOne);
|
|
|
/*R res = iStockDescService.updateByIdNew(stockOne);
|
|
|
if (!res.isSuccess()) {
|
