diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java index e481d232..6c086f8e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java @@ -169,18 +169,18 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe stockOperate.setUpdatedAt(times); stockOperate.setStatus("normal"); stockOperate.setPurveyorId(resources.getPurveyorId()); + if (StringUtils.isNotBlank(resources.getPurveyorId())) { + Optional byId1 = purveyorRepository.findById(Integer.valueOf(resources.getPurveyorId())); + if (byId1.isPresent()) { + TbShopPurveyor tbShopPurveyor = byId1.get(); + resources.setPurveyorName(tbShopPurveyor.getPurveyorName()); + } + } stockOperate.setPurveyorName(resources.getPurveyorName()); if (!resources.getIsImport().equals("true")) { //供应商退货 reject //供应商入库 purveyor if ("reject".equals(resources.getType()) || "purveyor".equals(resources.getType())) { - if (StringUtils.isNotBlank(resources.getPurveyorId())) { - Optional byId1 = purveyorRepository.findById(Integer.valueOf(resources.getPurveyorId())); - if (byId1.isPresent()) { - TbShopPurveyor tbShopPurveyor = byId1.get(); - resources.setPurveyorName(tbShopPurveyor.getPurveyorName()); - } - } TbShopPurveyorTransact purveyorTransact = new TbShopPurveyorTransact(); purveyorTransact.setShopId(resources.getShopId()); purveyorTransact.setPurveyorName(resources.getPurveyorName());