|
|
@ -32,8 +32,10 @@ import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.Collections;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
@ -197,6 +199,7 @@ public class StockOrderServiceImpl implements StockOrderService {
|
|
|
|
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECK);
|
|
|
|
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECK);
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
|
|
|
|
orderEntity.setErpFk("");
|
|
|
|
orderEntity.setErpFk("");
|
|
|
|
|
|
|
|
stockOrderEntity.setOrderIdFk("");
|
|
|
|
stockOrderDao.updateById(stockOrderEntity);
|
|
|
|
stockOrderDao.updateById(stockOrderEntity);
|
|
|
|
orderDao.updateOrder(orderEntity);
|
|
|
|
orderDao.updateOrder(orderEntity);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|