Skip to content

O
OZT-Integration
提交 141111e9 authored 作者: inroi's avatar inroi
浏览文件
操作

微调

上级 d00b395e
隐藏空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 38 行删除
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/Dao/CategoryDao.java
浏览文件 @ 141111e9
......@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import javax.annotation.PostConstruct;
import java.util.*;
......@@ -120,25 +121,27 @@ public class CategoryDao {
/**
* 查询日期
*
* @param map
* @return
*/
private String Stringwheredate(Map<String, String> map, String date) {
String where = null;
for (String key : map.keySet()) {
//拿到日期
String value = String.valueOf(map.get(key));
if (value != null && value.length() != 0) {
if ("FCreateDate".equals(key)) {
where = key + ">='" + date + "'" + "AND" + " " + key + "<='" + value + "'";
private String Stringwheredate(Map<String, String> map) {
StringBuilder where = null;
for (Map.Entry<String, String> entry : map.entrySet()) {
if (!StringUtils.isEmpty(entry.getValue())) {
if (where != null && entry.getKey().contains("_From")) {
where.append(" AND ").append(entry.getKey().split("_")[0]).append(">='").append(entry.getValue()).append("'");
} else if (where == null && entry.getKey().contains("_From")) {
where = new StringBuilder(entry.getKey().split("_")[0] + ">='" + entry.getValue() + "'");
} else if (where != null && entry.getKey().contains("_To")) {
where.append(" AND ").append(entry.getKey().split("_")[0]).append("<='").append(entry.getValue()).append("'");
} else if (where == null && entry.getKey().contains("_To")) {
where = new StringBuilder(entry.getKey().split("_")[0] + "<='" + entry.getValue() + "'");
} else if (where != null) {
where = where + " AND " + key + "=" + value;
where.append(" AND ").append(entry.getKey()).append("='").append(entry.getValue()).append("'");
} else {
where = key + "='" + value + "'";
where = new StringBuilder(entry.getKey() + "='" + entry.getValue() + "'");
}
}
}
if (where != null) {
return ",\"FilterString\":\"" + where + "\"";
}
......@@ -374,21 +377,15 @@ public class CategoryDao {
/**
* 查询日期
*
* @param sFormId
* @param key
* @param where
* @return
*/
public List<List<Object>> selectdate(String sFormId, Map<String, String> key, Map<String, String> where, String date, String name) {
List<List<Object>> list = null;
Map<String, List<List<Object>>> stringListHashMap = new HashMap<String, List<List<Object>>>();
public List<List<Object>> selectDate(String sFormId, Map<String, String> key, Map<String, String> where, String name) {
List<List<Object>> list;
String content;
try {
if (result) {
String content;
if (where != null) {
content = "{\"FormId\":\"" + sFormId + "\"," + Stringkey(key) + Stringwheredate(where, date) + "}";
content = "{\"FormId\":\"" + sFormId + "\"," + Stringkey(key) + Stringwheredate(where) + "}";
} else {
content = "{\"FormId\":\"" + sFormId + "\"," + Stringkey(key) + "}";
}
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/ImsAsnReceiveApi.java
浏览文件 @ 141111e9
......@@ -140,8 +140,8 @@ public class ImsAsnReceiveApi implements web_api {
String FEntryID = "0";
//过滤掉查询不到FEntryID的数据返回"0"
if (!ObjectUtils.isEmpty(FEntryIDlist)) {
if (FEntryIDlist.size() >= Integer.valueOf(ImsAsnReceive.getPoSeq())) {
FEntryID = FEntryIDlist.get(Integer.valueOf(ImsAsnReceive.getPoSeq()) - 1).get(0).toString();
if (FEntryIDlist.size() >= Integer.parseInt(ImsAsnReceive.getPoSeq())) {
FEntryID = FEntryIDlist.get(Integer.parseInt(ImsAsnReceive.getPoSeq()) - 1).get(0).toString();
}
} else {
FEntryID = "1";
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/PurchaseReturnKingdeeApi.java
浏览文件 @ 141111e9
......@@ -81,7 +81,7 @@ public class PurchaseReturnKingdeeApi {
* 获取金蝶云数据
*/
public List<Map<String, Object>> selectAndLog(Map<String, String> map, String name) {
List<List<Object>> list = categoryDao.selectAndLog(S_FORM_ID, key, map, name);
List<List<Object>> list = categoryDao.selectDate(S_FORM_ID, key, map, name);
return purchaseWarehousing(list);
}
......@@ -92,7 +92,6 @@ public class PurchaseReturnKingdeeApi {
public List<List<Object>> getPurchaseOrder(String id) {
List<List<Object>> list = categoryDao.select("PUR_PurchaseOrder", new LinkedHashMap<String, String>() {{
put("FBillNo", "FBillNo");
put("FPOOrderEntry_FSeq", "FPOOrderEntry_FSeq");
}}, new HashMap<String, String>() {{
put("FPOOrderEntry_FEntryID", id);
}});
......@@ -145,8 +144,7 @@ public class PurchaseReturnKingdeeApi {
detailedMap.put("AMOUNT", String.valueOf(objectList.get(22)));
List<List<Object>> tempList = getPurchaseOrder(String.valueOf(objectList.get(23)));
if (!CollectionUtils.isEmpty(tempList)) {
String purchaseBatchNumber = tempList.get(0).get(0).toString() + "_" + tempList.get(0).get(1).toString();
detailedMap.put("PURCHASE_BATCH_NUMBER", purchaseBatchNumber);
detailedMap.put("PURCHASE_BATCH_NUMBER", tempList.get(0).get(0).toString());
}
mapList.add(detailedMap);
}
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/PurchaseWarehousingKingdeeApi.java
浏览文件 @ 141111e9
......@@ -81,7 +81,7 @@ public class PurchaseWarehousingKingdeeApi {
* 获取金蝶云数据
*/
public List<Map<String, Object>> selectAndLog(Map<String, String> map, String name) {
List<List<Object>> list = categoryDao.selectAndLog(S_FORM_ID, key, map, name);
List<List<Object>> list = categoryDao.selectDate(S_FORM_ID, key, map, name);
return purchaseWarehousing(list);
}
......@@ -91,7 +91,6 @@ public class PurchaseWarehousingKingdeeApi {
public List<List<Object>> getPurchaseOrder(String id) {
List<List<Object>> list = categoryDao.select("PUR_PurchaseOrder", new LinkedHashMap<String, String>() {{
put("FBillNo", "FBillNo");
put("FPOOrderEntry_FSeq", "FPOOrderEntry_FSeq");
}}, new HashMap<String, String>() {{
put("FPOOrderEntry_FEntryID", id);
}});
......@@ -144,8 +143,7 @@ public class PurchaseWarehousingKingdeeApi {
detailedMap.put("AMOUNT", String.valueOf(objectList.get(22)));
List<List<Object>> tempList = getPurchaseOrder(String.valueOf(objectList.get(23)));
if (!CollectionUtils.isEmpty(tempList)) {
String purchaseBatchNumber = tempList.get(0).get(0).toString() + "_" + tempList.get(0).get(1).toString();
detailedMap.put("PURCHASE_BATCH_NUMBER", purchaseBatchNumber);
detailedMap.put("PURCHASE_BATCH_NUMBER", tempList.get(0).get(0).toString());
}
mapList.add(detailedMap);
}
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ImsPurchaseReturnServiceImpl.java
浏览文件 @ 141111e9
......@@ -39,8 +39,11 @@ public class ImsPurchaseReturnServiceImpl implements IImsPurchaseReturnService {
if (map.containsKey("SUPPLIER_CODE")) {
whereMap.put("FSupplierId.Fnumber", map.get("SUPPLIER_CODE").toString());
}
if (map.containsKey("RETURN_MATERIAL_DATE")) {
whereMap.put("FDate", map.get("RETURN_MATERIAL_DATE").toString());
if (map.containsKey("RETURN_MATERIAL_DATE_FROM")) {
whereMap.put("FDate_From", map.get("RETURN_MATERIAL_DATE_FROM").toString());
}
if (map.containsKey("RETURN_MATERIAL_DATE_TO")) {
whereMap.put("FDate_To", map.get("RETURN_MATERIAL_DATE_TO").toString());
}
if (map.containsKey("MATERIAL_CODE")) {
whereMap.put("FMaterialId.Fumber", map.get("MATERIAL_CODE").toString());
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ImsPurchaseWarehousingServiceImpl.java
浏览文件 @ 141111e9
......@@ -33,15 +33,18 @@ public class ImsPurchaseWarehousingServiceImpl implements IImsPurchaseWarehousin
//记录IMS日志
new ImsLogUtil().ImsRequestLog(JsonUtil.toString(map), "采购入库", "采购入库查询", "STK_InStock");
Map<String, String> whereMap = new HashMap<>(4);
Map<String, String> whereMap = new HashMap<>(5);
if (map.containsKey("WAREHOUSE_NO")) {
whereMap.put("FBillNo", map.get("WAREHOUSE_NO").toString());
}
if (map.containsKey("SUPPLIER_CODE")) {
whereMap.put("FSupplierId.Fnumber", map.get("SUPPLIER_CODE").toString());
}
if (map.containsKey("WAREHOUSING_DATE")) {
whereMap.put("FDate", map.get("WAREHOUSING_DATE").toString());
if (map.containsKey("WAREHOUSING_DATE_FROM")) {
whereMap.put("FDate_From", map.get("WAREHOUSING_DATE_FROM").toString());
}
if (map.containsKey("WAREHOUSING_DATE_TO")) {
whereMap.put("FDate_To", map.get("WAREHOUSING_DATE_TO").toString());
}
if (map.containsKey("MATERIAL_CODE")) {
whereMap.put("FMaterialId.Fumber", map.get("MATERIAL_CODE").toString());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论