|
|
@@ -619,6 +619,11 @@ public class KwtWaybillOrderService {
|
|
|
int count = logisticsOrderCirculateDao.insert(circulate);
|
|
|
return count > 0 ? circulate : null;
|
|
|
} else {
|
|
|
+ //有效循环单不做新增处理、已撤回/拒绝出车更新循环单信息
|
|
|
+ if (circulate.getStatus() == Global.NO) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
//更新原循环单ID
|
|
|
Long newId = new IdWorker(Global.NUMERICAL_ONE).nextId();
|
|
|
logisticsOrderCirculateDao.updateIdByKey(newId, null, circulate.getId(), LoginUserHolder.getUserId(), new Date());
|