demand: tms-订单管理-订单列表-查询订单时订单状态是未接单和已取消的订单,发货日期置空 tms-订单管理-订单列表-接单时更新发货日期,不更新下单日期
This commit is contained in:
parent
5582cb534d
commit
d5a5db16d3
@ -285,7 +285,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
{
|
{
|
||||||
// lastTraceInfo
|
// lastTraceInfo
|
||||||
List<EmisWaybill> list=emisWaybillMapper.selectOrderList(emisWaybill);
|
List<EmisWaybill> list=emisWaybillMapper.selectOrderList(emisWaybill);
|
||||||
|
if (list != null && !list.isEmpty()) {
|
||||||
|
for (EmisWaybill item : list) {
|
||||||
|
// 如果订单状态不为1,则将发货时间置空
|
||||||
|
if (item != null && item.getOrderStatus() != null && !"1".equals(item.getOrderStatus())) {
|
||||||
|
item.setSendDate(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1823,6 +1830,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
|
|
||||||
// 公共计算部分
|
// 公共计算部分
|
||||||
calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true);
|
calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true);
|
||||||
|
emisWaybillSave.setOrderDate(null);
|
||||||
|
|
||||||
|
|
||||||
// 变为已接单
|
// 变为已接单
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user