Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS
This commit is contained in:
@@ -23,8 +23,8 @@ public class OracleOrderBillMapper
|
||||
}
|
||||
TmsPriceBillRequest req = new TmsPriceBillRequest();
|
||||
// TAB_ORDER: ORDER_ID=客户订单号, ORG_ORDER_ID=运单号, TRANSFER_ORDER_ID=转单号, TRACK_ID=轨迹ID
|
||||
req.setOrderNo(firstStr(row, "ORDER_ID", "ORG_ORDER_ID", "TRANSFER_ORDER_ID"));
|
||||
req.setTrackingNo(firstStr(row, "ORG_ORDER_ID", "TRACK_ID", "BARCODE_NUMBER", "CUSTOMER_TRACK_ID"));
|
||||
req.setOrderNo(firstStr(row, "ORDER_ID"));
|
||||
req.setTrackingNo(firstStr(row, "ORG_ORDER_ID"));
|
||||
req.setTransferNo(firstStr(row, "TRANSFER_ORDER_ID"));
|
||||
// Oracle 人员字段为中文名;编码在落库前按 sys_user.nick_name 反查
|
||||
req.setBelongSaler(firstStr(row, "BELONG_SALER_OLD", "BELONG_SALER_NAME", "BELONG_SALER"));
|
||||
@@ -35,7 +35,7 @@ public class OracleOrderBillMapper
|
||||
req.setUpstreamRow(row);
|
||||
req.setCustomerCode(firstStr(row, "CUSTOMER_CODE"));
|
||||
req.setCustomerName(firstStr(row, "CUSTOMER_NAME"));
|
||||
String product = firstStr(row, "PRODUCT_CODE", "GOODS_CODE", "CHANNEL_CODE");
|
||||
String product = firstStr(row, "PRODUCT_CODE");
|
||||
if (StringUtils.isEmpty(product))
|
||||
{
|
||||
product = defaultProductCode;
|
||||
|
||||
Reference in New Issue
Block a user