Skip to content

S
SoSsDome
提交 30b4296e authored 作者: 李炎's avatar 李炎
浏览文件
操作

2.0

上级 a0489d4c
隐藏空白字符变更
内嵌 并排
正在显示 包含 46 行增加 和 36 行删除
src/main/java/com/santos/iost/controller/WebApi.java
浏览文件 @ 30b4296e
......@@ -87,9 +87,9 @@ public class WebApi {
Result result = new Result();
try {
if ("0".equals(soSsRequestVo.getOffset().toString())) {
soSsRequestVo.setOffset(1);
}
// if ("0".equals(soSsRequestVo.getOffset().toString())) {
// soSsRequestVo.setOffset(1);
// }
if (null == soSsRequestVo.getObjAPIName()) {
return Result.fail("操作失败", "objAPIName不可为空", "500");
} else if (soSsRequestVo.getObjAPIName().equals(materialService.apiName)) {
......
src/main/java/com/santos/iost/service/impl/SoSsReceiptServiceImpl.java
浏览文件 @ 30b4296e
......@@ -29,7 +29,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
* K3金蝶方请求字段
*/
String FCustomer = "FCustomer";//核算项目
String FCustomer_DSPName ="FCustomer_DSPName";//
String FCustomer_DSPName = "FCustomer_DSPName";//
String FAmountFor = "FAmountFor";//单据金额
String FDate = "FDate";//单据日期
String FBillNo = "FBillNo";
......@@ -69,7 +69,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
Map paramsMap = new HashMap();
Map Data = new LinkedHashMap();
Data.put("Top", soSsRequestVo.getLimit()*soSsRequestVo.getOffset());//返回行数
Data.put("Top", soSsRequestVo.getLimit() * soSsRequestVo.getOffset());//返回行数
Data.put("PageSize", soSsRequestVo.getLimit());//每页行数
Data.put("PageIndex", soSsRequestVo.getOffset());//第几页
if (checkFilter(soSsRequestVo)) {
......@@ -110,7 +110,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
masterField.put("objAPIName", apiName);
masterField.put("masterFieldVal", masterFieldVal);
masterField.put("detailFieldVals",new HashMap<>());
masterField.put("detailFieldVals", new HashMap<>());
dataList.add(masterField);
}
......@@ -123,7 +123,7 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);
Map masterField = new LinkedHashMap<>();
Map masterFieldVal = new LinkedHashMap<>();
masterFieldVal.put("ERPSystemNumber",listDateMap.get(FNumber));//编号
masterFieldVal.put("ERPSystemNumber", listDateMap.get(FNumber));//编号
masterFieldVal.put("customerName", listDateMap.get(FCustomer_DSPName));//客户名称
masterFieldVal.put("MSBsTotalAmount", listDateMap.get(FAmountFor));//本次回款总金额
masterFieldVal.put("MSBsDate", listDateMap.get(FDate));//回款日期
......@@ -150,20 +150,22 @@ public class SoSsReceiptServiceImpl implements SoSsReceiptService {
JSONObject fromObject = JSONObject.fromObject(soSsResponseDate.getData().toString());//转换数据类型
// Map Data = JSON.parseObject(soSsResponseDate.getData().toString(), Map.class);//转换数据类型
List list = JSON.parseObject(fromObject.get("Page3").toString(), List.class, Feature.OrderedField);
int i = 1;
List<Map> mapList = new ArrayList<>();
// int i = 1;
for (Object o : list) {
Map listDateMap = JSON.parseObject(o.toString(), Map.class);
Map<String, Object> map = new LinkedHashMap();
map.put("ERPSystemNumber",code);//主体唯一
map.put("ERPUniCode", code+"_"+listDateMap.get("FIndex3"));//字体唯一
map.put("ERPSystemNumber", code);//主体唯一
map.put("ERPUniCode", code + "_" + listDateMap.get("FIndex3"));//字体唯一
map.put("salesOrderNo", listDateMap.get(FEntryOrderNo));//销售订单编号
map.put("currentRemittanceAmount", listDateMap.get(FSettleAmountFor_3));//本次汇款金额
returnDate.put(apiName + i, new ArrayList<Map>() {{
add(map);
}});
i++;
mapList.add(map);
// returnDate.put(apiName + i, new ArrayList<Map>() {{
// add(map);
// }});
// i++;
}
returnDate.put(apiName + "Detail", mapList);
} else {
Map<String, Object> map = new LinkedHashMap();
map.put("message", soSsResponseDate.getMessage());
......
src/main/java/com/santos/iost/service/impl/SoSsSalesDeliveryServiceImpl.java
浏览文件 @ 30b4296e
......@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
//发货单
@Service
public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
......@@ -28,7 +29,7 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
* K3金蝶方请求字段
*/
String FSupplyID = "FSupplyID";//购货单位
String FSupplyID_DSPName ="FSupplyID_DSPName";
String FSupplyID_DSPName = "FSupplyID_DSPName";
String FHeadSelfB0162 = "FHeadSelfB0162";//地址
String FBillNo = "FBillNo";//编号
String Fdate = "Fdate";//日期
......@@ -75,7 +76,7 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
public Map changeGeta(SoSsRequestVo soSsRequestVo) {
Map paramsMap = new HashMap();
Map Data = new LinkedHashMap();
Data.put("Top", soSsRequestVo.getLimit()*soSsRequestVo.getOffset());//返回行数
Data.put("Top", soSsRequestVo.getLimit() * soSsRequestVo.getOffset());//返回行数
Data.put("PageSize", soSsRequestVo.getLimit());//每页行数
Data.put("PageIndex", soSsRequestVo.getOffset());//第几页
if (checkFilter(soSsRequestVo)) {
......@@ -119,7 +120,7 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
masterField.put("objAPIName", apiName);
masterField.put("masterFieldVal", masterFieldVal);
masterField.put("detailFieldVals",new HashMap<>());
masterField.put("detailFieldVals", new HashMap<>());
dataList.add(masterField);
}
return dataList;
......@@ -161,14 +162,15 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
JSONObject fromObject = JSONObject.fromObject(soSsResponseDate.getData().toString());//转换数据类型
// Map Data = JSON.parseObject(soSsResponseDate.getData().toString(), Map.class);
List list = JSON.parseObject(fromObject.get("Page2").toString(), List.class, Feature.OrderedField);
int i = 1;
List<Map> mapList = new ArrayList<>();
// int i = 1;
for (Object o : list) {
// if (code.equals("1420200311111")){
// System.out.println(fromObject);
// }
Map listDateMap = JSON.parseObject(o.toString(), Map.class);
Map<String, Object> map = new LinkedHashMap();
map.put("ERPSystemNumber",code);//主体唯一
map.put("ERPSystemNumber", code);//主体唯一
map.put("ERPUniCode", listDateMap.get("FDetailID2"));//子体唯一
map.put("productCode", JSONObject.fromObject(listDateMap.get(FItemID)).get("FNumber"));//产品编号
map.put("productName", listDateMap.get(FItemName));//产品名称
......@@ -181,11 +183,13 @@ public class SoSsSalesDeliveryServiceImpl implements SoSsSalesDeliveryService {
map.put("undeliveredQuantity", listDateMap.get(FEntrySelfB0165));//未发货数
map.put("deliveryWarehouse", JSONObject.fromObject(listDateMap.get(FDCStockID1)).get("FNumber"));//发货仓库
map.put("orderProductNumber", listDateMap.get(FOrderBillNo));//订单产品编号
returnDate.put(apiName + i, new ArrayList<Map>() {{
add(map);
}});
i++;
mapList.add(map);
// returnDate.put(apiName + i, new ArrayList<Map>() {{
// add(map);
// }});
// i++;
}
returnDate.put(apiName + "Detail", mapList);
} else {
Map<String, Object> map = new LinkedHashMap();
map.put("message", soSsResponseDate.getMessage());
......
src/main/java/com/santos/iost/service/impl/SoSsSalesInvoiceServiceImpl.java
浏览文件 @ 30b4296e
......@@ -152,7 +152,8 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService {
// Map Data = JSON.parseObject(soSsResponseDate.getData().toString(), Map.class);//转换数据类型
JSONObject fromObject = JSONObject.fromObject(soSsResponseDate.getData().toString());//转换数据类型
List list = JSON.parseObject(fromObject.get("Page2").toString(), List.class, Feature.OrderedField);
int i = 1;
// int i = 1;
List<Map> mapList = new ArrayList<>();
for (Object o : list) {
Map listDateMap = JSON.parseObject(o.toString(), Map.class);
Map<String,Object> map = new LinkedHashMap();
......@@ -162,13 +163,13 @@ public class SoSsSalesInvoiceServiceImpl implements SoSsSalesInvoiceService {
map.put("quantity", listDateMap.get(Fauxqty));//数量
map.put("salesUnitPrice", listDateMap.get(FAuxPriceDiscount));//销售单价
map.put("thisInvoicingSubtotal", listDateMap.get(FAllAmount));//本次开票小计
returnDate.put(apiName + i, new ArrayList<Map>() {{
add(map);
}});
i++;
mapList.add(map);
// returnDate.put(apiName + i, new ArrayList<Map>() {{
// add(map);
// }});
// i++;
}
returnDate.put(apiName+"Detail", mapList);
} else {
Map<String,Object> map = new LinkedHashMap();
map.put("message",soSsResponseDate.getMessage());
......
src/main/java/com/santos/iost/service/impl/SoSsSalesOrderServiceImpl.java
浏览文件 @ 30b4296e
......@@ -152,7 +152,8 @@ public class SoSsSalesOrderServiceImpl implements SoSsSalesOrderService {
if (null != soSsResponseDate.getStatusCode() && soSsResponseDate.getStatusCode().equals("200")) {
JSONObject fromObject = JSONObject.fromObject(soSsResponseDate.getData().toString());//转换数据类型
List list = JSON.parseObject(fromObject.get("Page2").toString(), List.class, Feature.OrderedField);
int i = 1;
// int i = 1;
List<Map> mapList = new ArrayList<>();
for (Object o : list) {
Map listDateMap = JSON.parseObject(o.toString(), Map.class);
Map<String, Object> map = new LinkedHashMap();
......@@ -168,11 +169,13 @@ public class SoSsSalesOrderServiceImpl implements SoSsSalesOrderService {
map.put("companyNumber", JSONObject.fromObject(listDateMap.get(FUnitID)).get("FName"));//单位
map.put("actualUnitPriceIncludingTax", listDateMap.get(FAuxPriceDiscount));//实际含税单价
map.put("totalPriceAndTax", listDateMap.get(FAllAmount));//价税合计
returnDate.put(apiName + i, new ArrayList<Map>() {{
add(map);
}});
i++;
mapList.add(map);
// returnDate.put(apiName + i, new ArrayList<Map>() {{
// add(map);
// }});
// i++;
}
returnDate.put(apiName+"Detail", mapList);
} else {
Map<String, Object> map = new LinkedHashMap();
map.put("message", soSsResponseDate.getMessage());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论