|
@@ -6203,6 +6203,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
@Override
|
|
@Override
|
|
|
public PjShip detailProduction(PjShip ship) {
|
|
public PjShip detailProduction(PjShip ship) {
|
|
|
PjShip detail = baseMapper.selectById(ship.getId());
|
|
PjShip detail = baseMapper.selectById(ship.getId());
|
|
|
|
|
+ R<User> res = userClient.userInfoById(detail.getCreateUser());
|
|
|
|
|
+ if (res.isSuccess() && res.getData() != null) {
|
|
|
|
|
+ detail.setCreateUserName(res.getData().getRealName());
|
|
|
|
|
+ }
|
|
|
//明细
|
|
//明细
|
|
|
LambdaQueryWrapper<PjShipItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<PjShipItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
itemsLambdaQueryWrapper.eq(PjShipItems::getTenantId, AuthUtil.getTenantId())
|
|
itemsLambdaQueryWrapper.eq(PjShipItems::getTenantId, AuthUtil.getTenantId())
|
|
@@ -6279,6 +6283,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
List<PjShipItems> shipItemsList = new ArrayList<>();
|
|
List<PjShipItems> shipItemsList = new ArrayList<>();
|
|
|
if (CollectionUtils.isNotEmpty(ship.getShipItemsList())) {
|
|
if (CollectionUtils.isNotEmpty(ship.getShipItemsList())) {
|
|
|
ship.getShipItemsList().forEach(item -> {
|
|
ship.getShipItemsList().forEach(item -> {
|
|
|
|
|
+ item.setGoodsNum(ship.getGoodsTotalNum());
|
|
|
if (item.getId() == null) {
|
|
if (item.getId() == null) {
|
|
|
item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
|
|
item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
|
|
|
item.setCreateTime(new Date());
|
|
item.setCreateTime(new Date());
|