# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

取值：提单关联的大包对应下一个尾程快递匹配到到尾程快递，显示在提单上，若有多个 则显示多个
提单列表上新增该字段

# Conflicts:
#	ccs_base/data/data.xml

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

所选操作时间超过24小时，请再次确认操作时间
仅做提示；

提单完成增加忽略节点异常，获取到清关邮件，如果没有做清关开始和结束处理，则发送邮件

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2、确定时，如果勾选了忽略节点异常，不用管提单关务节点状态是否完成，若有预警，也需发送邮件，并且将该提单置为已完成；

增加提货的相关功能

2、查询托盘理货的性能优化

2、交货检查是否倒序的接口优化

2、大包理货状态新增：已提货（放在未理货后面）；
3、提单详情右上角新增已提货大包的按钮，显示数量，跳转显示有提货时间，提货人的大包信息；
4、PDA扫码记录，类型新增：提货；
5、PDA交货时，提示：该提单未到交货时间，有风险产生倒叙，请间隔规定时间后再扫码；此处判断需加上查找提货记录；

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

进行完成操作检查倒挂和漏推的情况，只要有小包状态不是当前节点的就提单变为清关中

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.