|
|
@@ -6288,7 +6288,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
List<PjShipItems> shipItemsList = new ArrayList<>();
|
|
|
if (CollectionUtils.isNotEmpty(ship.getShipItemsList())) {
|
|
|
ship.getShipItemsList().forEach(item -> {
|
|
|
- item.setGoodsNum(ship.getGoodsTotalNum());
|
|
|
if (item.getId() == null) {
|
|
|
item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
|
|
|
item.setCreateTime(new Date());
|
|
|
@@ -6994,23 +6993,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
|
|
|
picking.setUpdateTime(null);
|
|
|
picking.setUpdateUser(null);
|
|
|
baseMapper.insert(picking);
|
|
|
- // 保存订单明细
|
|
|
- List<PjShipItems> shipItemsListNew = new ArrayList<>();
|
|
|
- if (CollectionUtils.isNotEmpty(shipItemsList)) {
|
|
|
- shipItemsList.forEach(item -> {
|
|
|
- item.setId(null);
|
|
|
- item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
|
|
|
- item.setCreateTime(new Date());
|
|
|
- item.setCreateUser(AuthUtil.getUserId());
|
|
|
- item.setPid(picking.getId());
|
|
|
- item.setTenantId(AuthUtil.getTenantId());
|
|
|
- item.setUpdateTime(null);
|
|
|
- item.setUpdateUser(null);
|
|
|
- shipItemsListNew.add(item);
|
|
|
- });
|
|
|
- shipItemsService.saveOrUpdateBatch(shipItemsListNew);
|
|
|
- }
|
|
|
- picking.setShipItemsList(shipItemsListNew);
|
|
|
return R.data(picking);
|
|
|
}
|
|
|
|