|
@@ -456,9 +456,11 @@ public class WebsitSalesLogic {
|
|
|
detail.setConvertQty(bean.getConvertQty());
|
|
|
detail.setConvertPrice(bean.getConvertPrice());
|
|
|
|
|
|
- final WorkerGoods workerGoods = workerGoodsService.getById(bean.getWorkerGoodsId());
|
|
|
- detail.setWorkerGoodsId(workerGoods.getStatus().equals(ESGoodsStatusEnum.ON.getKey()) ? bean.getWorkerGoodsId() : null);
|
|
|
- detail.setWorkerGoodsName(workerGoods.getStatus().equals(ESGoodsStatusEnum.ON.getKey()) ? bean.getWorkerGoodsName() : null);
|
|
|
+ if (bean.getGoodsType().equals(WebsitGoodsTypeEnum.M.toString())) {
|
|
|
+ final WorkerGoods workerGoods = workerGoodsService.getById(bean.getWorkerGoodsId());
|
|
|
+ detail.setWorkerGoodsId(workerGoods.getStatus().equals(ESGoodsStatusEnum.ON.getKey()) ? bean.getWorkerGoodsId() : null);
|
|
|
+ detail.setWorkerGoodsName(workerGoods.getStatus().equals(ESGoodsStatusEnum.ON.getKey()) ? bean.getWorkerGoodsName() : null);
|
|
|
+ }
|
|
|
|
|
|
detail.setOrigPartsPrice(bean.getOrigPartsPrice());
|
|
|
|