委托方增加bug,oms线路修复,o-t报关修改
This commit is contained in:
+4
@@ -520,6 +520,10 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String route;
|
||||
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String routeName;
|
||||
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String containerType;
|
||||
|
||||
+2
@@ -212,6 +212,8 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
|
||||
tmsOrderAddDTO.setOrganizationId(organizationId);
|
||||
tmsOrderAddDTO.setLoginUser(loginUser);
|
||||
tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
|
||||
tmsOrderAddDTO.setIsDeclare(businessDocumentOrder.getIsDeclare().intValue());
|
||||
tmsOrderAddDTO.setIsDeclare(businessDocumentOrder.getIsDeclare() != null ? businessDocumentOrder.getIsDeclare().intValue() : null);
|
||||
String mainOrderNum = businessDocumentOrder.getMainOrderNum();
|
||||
if (mainOrderNum != null) {
|
||||
tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
|
||||
|
||||
+3
@@ -207,6 +207,9 @@ public class ExecuteOrderPO extends BaseVOEntity{
|
||||
@ApiModelProperty("运输线路")
|
||||
private String route;
|
||||
|
||||
@ApiModelProperty("运输线路")
|
||||
private String routeName;
|
||||
|
||||
@ApiModelProperty("发票编号")
|
||||
@Excel(name = "发票编号")
|
||||
private String invoiceNumber;
|
||||
|
||||
Reference in New Issue
Block a user