提交 19accd4e authored 作者: 李炎's avatar 李炎

返回转义字符串

上级 6407414c
...@@ -135,7 +135,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService { ...@@ -135,7 +135,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
Map masterField = new LinkedHashMap<>(); Map masterField = new LinkedHashMap<>();
Map masterFieldVal = new LinkedHashMap<>(); Map masterFieldVal = new LinkedHashMap<>();
masterFieldVal.put("ERPSystemNumber", listDateMap.get(FNumber));//编号 masterFieldVal.put("ERPSystemNumber", listDateMap.get(FNumber));//编号
masterFieldVal.put("customerId", listDateMap.get(FCustomer_FNDName));//客户编号 masterFieldVal.put("customerId", listDateMap.get(FCustomer_FNDName).toString());//客户编号
masterFieldVal.put("customerName", listDateMap.get(FCustomer_DSPName));//客户名称 masterFieldVal.put("customerName", listDateMap.get(FCustomer_DSPName));//客户名称
masterFieldVal.put("MSBsTotalAmount", listDateMap.get(FAmountFor));//本次回款总金额 masterFieldVal.put("MSBsTotalAmount", listDateMap.get(FAmountFor));//本次回款总金额
masterFieldVal.put("MSBsDate", listDateMap.get(FDate));//回款日期 masterFieldVal.put("MSBsDate", listDateMap.get(FDate));//回款日期
...@@ -159,7 +159,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService { ...@@ -159,7 +159,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
Object personCharge=new Object(); Object personCharge=new Object();
Object customerId=new Object(); Object customerId=new Object();
masterFieldVal.put("ERPSystemNumber", listDateMap.get(FNumber));//编号 masterFieldVal.put("ERPSystemNumber", listDateMap.get(FNumber));//编号
customerId = listDateMap.get(FCustomer_FNDName); customerId = listDateMap.get(FCustomer_FNDName).toString();
masterFieldVal.put("customerId", customerId);//客户编号 masterFieldVal.put("customerId", customerId);//客户编号
masterFieldVal.put("customerName", listDateMap.get(FCustomer_DSPName));//客户名称 masterFieldVal.put("customerName", listDateMap.get(FCustomer_DSPName));//客户名称
masterFieldVal.put("MSBsTotalAmount", listDateMap.get(FAmountFor));//本次回款总金额 masterFieldVal.put("MSBsTotalAmount", listDateMap.get(FAmountFor));//本次回款总金额
...@@ -194,7 +194,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService { ...@@ -194,7 +194,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
for (Object o : list) { for (Object o : list) {
Map listDateMap = JSON.parseObject(o.toString(), Map.class); Map listDateMap = JSON.parseObject(o.toString(), Map.class);
Map<String, Object> map = new LinkedHashMap(); Map<String, Object> map = new LinkedHashMap();
map.put("customerId", customerId);//客户id map.put("customerId", customerId.toString());//客户id
map.put("ERPUniCode", code + "_" + listDateMap.get("FIndex3"));//字体唯一 map.put("ERPUniCode", code + "_" + listDateMap.get("FIndex3"));//字体唯一
map.put("salesOrderNo", listDateMap.get(FEntryOrderNo));//销售订单编号 map.put("salesOrderNo", listDateMap.get(FEntryOrderNo));//销售订单编号
map.put("currentRemittanceAmount", listDateMap.get(FSettleAmountFor_3));//本次汇款金额 map.put("currentRemittanceAmount", listDateMap.get(FSettleAmountFor_3));//本次汇款金额
......
...@@ -224,8 +224,8 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService { ...@@ -224,8 +224,8 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
map.put("undeliveredQuantity", listDateMap.get(FEntrySelfB0165));//未发货数 map.put("undeliveredQuantity", listDateMap.get(FEntrySelfB0165));//未发货数
map.put("deliveryWarehouse", JSONObject.fromObject(listDateMap.get(FDCStockID1)).get("FNumber"));//发货仓库 map.put("deliveryWarehouse", JSONObject.fromObject(listDateMap.get(FDCStockID1)).get("FNumber"));//发货仓库
map.put("orderProductNumber", listDateMap.get(FOrderBillNo));//订单产品编号 map.put("orderProductNumber", listDateMap.get(FOrderBillNo));//订单产品编号
map.put("saleOrderId", listDateMap.get(FOrderBillNo));//订单产品编号 map.put("saleOrderId", listDateMap.get(FOrderBillNo).toString());//订单产品编号
map.put("orderProductId",listDateMap.get(FOrderEntryID));//订单产品编号 map.put("orderProductId",listDateMap.get(FOrderEntryID).toString());//订单产品编号
map.put("personCharge", personCharge);//业务员 map.put("personCharge", personCharge);//业务员
mapList.add(map); mapList.add(map);
// returnDate.put(apiName + i, new ArrayList<Map>() {{ // returnDate.put(apiName + i, new ArrayList<Map>() {{
......
...@@ -134,7 +134,7 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService { ...@@ -134,7 +134,7 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService {
Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField); Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);
Map masterField = new LinkedHashMap<>(); Map masterField = new LinkedHashMap<>();
Map masterFieldVal = new LinkedHashMap<>(); Map masterFieldVal = new LinkedHashMap<>();
masterFieldVal.put("customerId",listDateMap.get(FCustID_FNDName));//客户编号 masterFieldVal.put("customerId",listDateMap.get(FCustID_FNDName).toString());//客户编号
masterFieldVal.put("customerName", listDateMap.get(FCustID_DSPName));//客户名称 masterFieldVal.put("customerName", listDateMap.get(FCustID_DSPName));//客户名称
masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期 masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期
// masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期 // masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期
...@@ -157,7 +157,7 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService { ...@@ -157,7 +157,7 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService {
Map masterField = new LinkedHashMap<>(); Map masterField = new LinkedHashMap<>();
Map masterFieldVal = new LinkedHashMap<>(); Map masterFieldVal = new LinkedHashMap<>();
Object personCharge=new Object(); Object personCharge=new Object();
masterFieldVal.put("customerId",listDateMap.get(FCustID_FNDName));//客户编号 masterFieldVal.put("customerId",listDateMap.get(FCustID_FNDName).toString());//客户编号
masterFieldVal.put("customerName", listDateMap.get(FCustID_DSPName));//客户名称 masterFieldVal.put("customerName", listDateMap.get(FCustID_DSPName));//客户名称
masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期 masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期
// masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期 // masterFieldVal.put("billingDate", listDateMap.get(Fdate));//开票日期
...@@ -196,12 +196,12 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService { ...@@ -196,12 +196,12 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService {
// map.put("ERPSystemNumber",code);//主体唯一 // map.put("ERPSystemNumber",code);//主体唯一
map.put("ERPUniCode", listDateMap.get("FDetailID2"));//子体唯一 map.put("ERPUniCode", listDateMap.get("FDetailID2"));//子体唯一
map.put("productCode", JSONObject.fromObject(listDateMap.get(FItemID)).get("FNumber"));//产品编码 map.put("productCode", JSONObject.fromObject(listDateMap.get(FItemID)).get("FNumber"));//产品编码
map.put("productId", JSONObject.fromObject(listDateMap.get(FItemID)).get("FNumber"));//产品编码 map.put("productId", JSONObject.fromObject(listDateMap.get(FItemID)).get("FNumber").toString());//产品编号
map.put("quantity", listDateMap.get(Fauxqty));//数量 map.put("quantity", listDateMap.get(Fauxqty));//数量
map.put("salesUnitPrice", listDateMap.get(FAuxPriceDiscount));//销售单价 map.put("salesUnitPrice", listDateMap.get(FAuxPriceDiscount));//销售单价
map.put("thisInvoicingSubtotal", listDateMap.get(FAllAmount));//本次开票小计 map.put("thisInvoicingSubtotal", listDateMap.get(FAllAmount));//本次开票小计
map.put("saleOrderId",listDateMap.get(FOrderBillNo));//销售订单编号 map.put("saleOrderId",listDateMap.get(FOrderBillNo).toString());//销售订单编号
map.put("orderProductId",listDateMap.get(FOrderEntryID));//订单产品编号 map.put("orderProductId",listDateMap.get(FOrderEntryID).toString());//订单产品编号
map.put("personCharge",personCharge);//业务员 map.put("personCharge",personCharge);//业务员
mapList.add(map); mapList.add(map);
} }
......
...@@ -40,7 +40,7 @@ public class StringUtil { ...@@ -40,7 +40,7 @@ public class StringUtil {
return date; return date;
} }
// public static String randomNumber() { public static String randomNumber() {
// return RandomUtil.randomString(BASE_CHECK_CODES, 7); return RandomUtil.randomString(BASE_CHECK_CODES, 7);
// } }
} }
\ No newline at end of file
...@@ -47,10 +47,10 @@ class JintaiDomeApplicationTests { ...@@ -47,10 +47,10 @@ class JintaiDomeApplicationTests {
String getGetMaterialUrl = "http://123.58.109.39:86/K3API/Material/GetList?token="; String getGetMaterialUrl = "http://123.58.109.39:86/K3API/Material/GetList?token=";
String includeDetailUrl = "http://123.58.109.39:86/K3API/SO/GetDetail?token="; String includeDetailUrl = "http://123.58.109.39:86/K3API/SO/GetDetail?token=";
String token; String token;
@Autowired // @Autowired
SoSsDao soSsDao; // SoSsDao soSsDao;
// @Test @Test
void contextLoads() throws Exception { void contextLoads() throws Exception {
// String s = HttpUtil.get(getTokenUrl); // String s = HttpUtil.get(getTokenUrl);
// Map map = JSON.parseObject(s, Map.class); // Map map = JSON.parseObject(s, Map.class);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论