diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java index acdb3836..191c0188 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java @@ -185,12 +185,17 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { throw new Exception("店铺信息不存在"); } TbShopPurveyor purveyor = tbShopPurveyorRepository.getById(resources.getSupplierId()); + TbProductStockOperate stockOperate = new TbProductStockOperate(); if (Objects.isNull(purveyor)) { - throw new Exception("不存在的供应商"); + stockOperate.setPurveyorId(null); + stockOperate.setPurveyorName(null); + }else { + stockOperate.setPurveyorId(resources.getSupplierId().toString()); + stockOperate.setPurveyorName(purveyor.getPurveyorName()); } - TbProductStockOperate stockOperate = new TbProductStockOperate(); + stockOperate.setShopId(tbShopInfo.getId().toString()); stockOperate.setStockSnap(""); stockOperate.setType(resources.getType().equals("in")?"cons_in":"cons_out"); @@ -204,8 +209,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { stockOperate.setCreatedAt(System.currentTimeMillis()); stockOperate.setUpdatedAt(System.currentTimeMillis()); stockOperate.setStatus("normal"); - stockOperate.setPurveyorId(resources.getSupplierId().toString()); - stockOperate.setPurveyorName(purveyor.getPurveyorName()); + JSONArray array=new JSONArray(); @@ -224,9 +228,9 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { TbShopPurveyorTransact purveyorTransact = new TbShopPurveyorTransact(); purveyorTransact.setShopId(tbShopInfo.getId().toString()); - purveyorTransact.setPurveyorName(purveyor.getPurveyorName()); - purveyorTransact.setPurveyorId(purveyor.getId().toString()); - purveyorTransact.setRemark(""); + purveyorTransact.setPurveyorName(Objects.isNull(purveyor)?"":purveyor.getPurveyorName()); + purveyorTransact.setPurveyorId(Objects.isNull(purveyor)?"":purveyor.getId().toString()); + purveyorTransact.setRemark(resources.getRemark()); purveyorTransact.setCreatedAt(System.currentTimeMillis()); purveyorTransact.setUpdatedAt(System.currentTimeMillis());