|
|
@@ -2072,12 +2072,10 @@ public class KwtWaybillOrderService {
|
|
|
wOrder.set_id(waybillOrder.getId());
|
|
|
wOrder.setLoadAmount(params.getType() == Global.NUMERICAL_ONE ? params.getAmount() : null);
|
|
|
wOrder.setLoadTime(params.getType() == Global.NUMERICAL_ONE ? params.getOperateTime() : null);
|
|
|
- wOrder.setLoadUrls(params.getType() == Global.NUMERICAL_ONE ? params.getUrls() : null);
|
|
|
-
|
|
|
+ wOrder.setLoadUrls(params.getType() == Global.NUMERICAL_ONE ? FileUtils.replaceAllBatch(params.getUrls()) : null);
|
|
|
wOrder.setUnloadAmount(params.getType() == Global.NUMERICAL_TWO ? params.getAmount() : null);
|
|
|
wOrder.setUnloadTime(params.getType() == Global.NUMERICAL_TWO ? params.getOperateTime() : null);
|
|
|
- wOrder.setUnloadUrls(params.getType() == Global.NUMERICAL_TWO ? params.getUrls() : null);
|
|
|
-
|
|
|
+ wOrder.setUnloadUrls(params.getType() == Global.NUMERICAL_TWO ? FileUtils.replaceAllBatch(params.getUrls()) : null);
|
|
|
wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
|
|
|
wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
|
|
|
editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);
|
|
|
@@ -2126,12 +2124,12 @@ public class KwtWaybillOrderService {
|
|
|
/**3更新榜单信息**/
|
|
|
KwtWaybillOrderTicket loadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_ONE);
|
|
|
loadTicket.setAmount(params.getLoadAmount());
|
|
|
- loadTicket.setUrls(params.getLoadUrls());
|
|
|
+ loadTicket.setUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
|
|
|
loadTicket.setOperateTime(params.getLoadOperateTime());
|
|
|
waybillOrderTicketDao.updateById(loadTicket);
|
|
|
KwtWaybillOrderTicket unloadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_TWO);
|
|
|
unloadTicket.setAmount(params.getUnloadAmount());
|
|
|
- unloadTicket.setUrls(params.getUnloadUrls());
|
|
|
+ unloadTicket.setUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
|
|
|
unloadTicket.setOperateTime(params.getUnloadOperateTime());
|
|
|
waybillOrderTicketDao.updateById(unloadTicket);
|
|
|
|
|
|
@@ -2144,10 +2142,10 @@ public class KwtWaybillOrderService {
|
|
|
wOrder.set_id(waybillOrder.getId());
|
|
|
wOrder.setLoadAmount(waybillOrder.getLoadAmount());
|
|
|
wOrder.setLoadTime(params.getLoadOperateTime());
|
|
|
- wOrder.setLoadUrls(params.getLoadUrls());
|
|
|
+ wOrder.setLoadUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
|
|
|
wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
|
|
|
wOrder.setUnloadTime(params.getUnloadOperateTime());
|
|
|
- wOrder.setUnloadUrls(params.getUnloadUrls());
|
|
|
+ wOrder.setUnloadUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
|
|
|
wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
|
|
|
wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
|
|
|
editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);
|
|
|
@@ -2204,7 +2202,7 @@ public class KwtWaybillOrderService {
|
|
|
result.put("goodsName", goods != null ? goods.getGoodsName() : null);
|
|
|
result.put("loadStatus", loadTicket != null ? 0 : 1);
|
|
|
result.put("loadAmount", loadTicket != null ? loadTicket.getAmount() : null);
|
|
|
- result.put("loadUrls", loadTicket != null ? loadTicket.getUrls() : null);
|
|
|
+ result.put("loadUrls", loadTicket != null ? FileUtils.spliceBatch(loadTicket.getUrls()) : null);
|
|
|
result.put("loadOperateTime", loadTicket != null ? loadTicket.getOperateTime() : null);
|
|
|
result.put("loadCreateTime", loadTicket != null ? loadTicket.getCreateTime() : null);
|
|
|
result.put("loadCreateByName", usersMap.get(loadTicket.getUpdateBy()));
|
|
|
@@ -2212,7 +2210,7 @@ public class KwtWaybillOrderService {
|
|
|
result.put("loadDetailAddress", loadAddress != null ? loadAddress.getDetailAddress() : null);
|
|
|
result.put("unloadStatus", loadTicket != null ? 0 : 1);
|
|
|
result.put("unloadAmount", unloadTicket != null ? unloadTicket.getAmount() : null);
|
|
|
- result.put("unloadUrls", unloadTicket != null ? unloadTicket.getUrls() : null);
|
|
|
+ result.put("unloadUrls", unloadTicket != null ? FileUtils.spliceBatch(unloadTicket.getUrls()) : null);
|
|
|
result.put("unloadOperateTime", unloadTicket != null ? unloadTicket.getOperateTime() : null);
|
|
|
result.put("unloadCreateTime", unloadTicket != null ? unloadTicket.getCreateTime() : null);
|
|
|
result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
|
|
|
@@ -2349,12 +2347,12 @@ public class KwtWaybillOrderService {
|
|
|
/**3更新榜单信息**/
|
|
|
KwtWaybillOrderTicket loadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_ONE);
|
|
|
loadTicket.setAmount(params.getLoadAmount());
|
|
|
- loadTicket.setUrls(params.getLoadUrls());
|
|
|
+ loadTicket.setUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
|
|
|
loadTicket.setOperateTime(params.getLoadOperateTime());
|
|
|
waybillOrderTicketDao.updateById(loadTicket);
|
|
|
KwtWaybillOrderTicket unloadTicket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), Global.NUMERICAL_TWO);
|
|
|
unloadTicket.setAmount(params.getUnloadAmount());
|
|
|
- unloadTicket.setUrls(params.getUnloadUrls());
|
|
|
+ unloadTicket.setUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
|
|
|
unloadTicket.setOperateTime(params.getUnloadOperateTime());
|
|
|
waybillOrderTicketDao.updateById(unloadTicket);
|
|
|
|
|
|
@@ -2409,10 +2407,10 @@ public class KwtWaybillOrderService {
|
|
|
wOrder.set_id(waybillOrder.getId());
|
|
|
wOrder.setLoadAmount(waybillOrder.getLoadAmount());
|
|
|
wOrder.setLoadTime(params.getLoadOperateTime());
|
|
|
- wOrder.setLoadUrls(params.getLoadUrls());
|
|
|
+ wOrder.setLoadUrls(FileUtils.replaceAllBatch(params.getLoadUrls()));
|
|
|
wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
|
|
|
wOrder.setUnloadTime(params.getUnloadOperateTime());
|
|
|
- wOrder.setUnloadUrls(params.getUnloadUrls());
|
|
|
+ wOrder.setUnloadUrls(FileUtils.replaceAllBatch(params.getUnloadUrls()));
|
|
|
wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
|
|
|
wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
|
|
|
editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);
|