|
|
@@ -462,11 +462,12 @@ public class GoodsDescController extends BladeController {
|
|
|
.ne(PjProductLaunch::getInventory, 0)
|
|
|
.eq(PjProductLaunch::getUpAndDownShelves, 1);
|
|
|
queryWrapper.apply("find_in_set(sales_company_id,'" + AuthUtil.getDeptId() + "')");
|
|
|
- if (ObjectUtils.isNotNull(goods.getStock())) {
|
|
|
+ // 在页面未选择仓库的情况下,没有显示数据
|
|
|
+/* if (ObjectUtils.isNotNull(goods.getStock())) {
|
|
|
queryWrapper.eq(PjProductLaunch::getBillType, 0);
|
|
|
} else {
|
|
|
queryWrapper.eq(PjProductLaunch::getBillType, 1);
|
|
|
- }
|
|
|
+ }*/
|
|
|
List<PjProductLaunch> pjProductLaunchList = productLaunchService.list(queryWrapper);
|
|
|
List<Long> ids = pjProductLaunchList.stream().map(PjProductLaunch::getGoodsId).distinct().collect(Collectors.toList());
|
|
|
PjCorpsDesc pjCorpsDesc = corpsDescService.getById(goods.getCustomId());
|