|
@@ -620,7 +620,7 @@ public class KwtWaybillOrderService {
|
|
|
} else {
|
|
} else {
|
|
|
//更新原循环单ID
|
|
//更新原循环单ID
|
|
|
Long newId = new IdWorker(Global.NUMERICAL_ONE).nextId();
|
|
Long newId = new IdWorker(Global.NUMERICAL_ONE).nextId();
|
|
|
- logisticsOrderCirculateDao.updateIdByKey(newId, null, circulate.getId(), waybillOrder.getUpdateBy(), waybillOrder.getUpdateTime());
|
|
|
|
|
|
|
+ logisticsOrderCirculateDao.updateIdByKey(newId, null, circulate.getId(), LoginUserHolder.getUserId(), new Date());
|
|
|
|
|
|
|
|
BeanUtils.copyPropertiesValue(waybillOrder, circulate);
|
|
BeanUtils.copyPropertiesValue(waybillOrder, circulate);
|
|
|
circulate.setId(newId);
|
|
circulate.setId(newId);
|