|
|
@ -3720,6 +3720,30 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
//判断是否有已经有order了
|
|
|
|
//判断是否有已经有order了
|
|
|
|
Long orderId = finalOrderCodes1.get(e); |
|
|
|
Long orderId = finalOrderCodes1.get(e); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(ObjectUtil.isNull(orderId)){ |
|
|
|
|
|
|
|
//没有id
|
|
|
|
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = stockArticleMap.get(e); |
|
|
|
|
|
|
|
DistributionStockArticleEntity newStockArticleEntity = new DistributionStockArticleEntity(); |
|
|
|
|
|
|
|
BeanUtil.copy(stockArticleEntity,newStockArticleEntity); |
|
|
|
|
|
|
|
newStockArticleEntity.setId(null); |
|
|
|
|
|
|
|
newStockArticleEntity.setCreateUser(userId); |
|
|
|
|
|
|
|
newStockArticleEntity.setUpdateUser(userId); |
|
|
|
|
|
|
|
newStockArticleEntity.setWarehouseId(warehouseId); |
|
|
|
|
|
|
|
newStockArticleEntity.setWarehouse(warehouseName); |
|
|
|
|
|
|
|
newStockArticleEntity.setHandQuantity(0); |
|
|
|
|
|
|
|
newStockArticleEntity.setIncomingNum(0); |
|
|
|
|
|
|
|
newStockArticleEntity.setCreateUserName(nickName); |
|
|
|
|
|
|
|
newStockArticleEntity.setOrderStatus("10"); |
|
|
|
|
|
|
|
newStockArticleEntity.setStockupStatus("10"); |
|
|
|
|
|
|
|
newStockArticleEntity.setReservationStatus("10"); |
|
|
|
|
|
|
|
newStockArticleEntity.setGroundingStatus("10"); |
|
|
|
|
|
|
|
newStockArticleEntity.setOrderReceiveStatus("10"); |
|
|
|
|
|
|
|
newStockArticleEntity.setFreezeStatus("10"); |
|
|
|
|
|
|
|
orderId = distributionStockArticleClient.addData(newStockArticleEntity); |
|
|
|
|
|
|
|
finalOrderCodes1.put(e,orderId); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<TrunklineCarsLoadScanEntity> carsLoadScanList = carsLoadScanEntitiesMap.get(e); |
|
|
|
List<TrunklineCarsLoadScanEntity> carsLoadScanList = carsLoadScanEntitiesMap.get(e); |
|
|
|
Long finalOrderId = orderId; |
|
|
|
Long finalOrderId = orderId; |
|
|
|
carsLoadScanList.forEach(p -> { |
|
|
|
carsLoadScanList.forEach(p -> { |
|
|
|