Skip to content

O
OZT-Integration
提交 cdce820c authored 作者: 李炎's avatar 李炎
浏览文件
操作

更新后台

上级 fd0df6c0
隐藏空白字符变更
内嵌 并排
正在显示 包含 62 行增加 和 62 行删除
db/API.sql
浏览文件 @ cdce820c
This source diff could not be displayed because it is too large. You can view the blob instead.
jeecg-boot-base-common/src/main/java/org/jeecg/config/Swagger2Config.java
浏览文件 @ cdce820c
......@@ -99,14 +99,14 @@ public class Swagger2Config implements WebMvcConfigurer {
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
// //大标题
.title("Jeecg-Boot 后台服务API接口文档")
.title("后台服务API接口文档")
// 版本号
.version("1.0")
// .termsOfServiceUrl("NO terms of service")
// 描述
.description("后台API接口")
// 作者
.contact("JEECG团队")
// .contact("JEECG团队")
.license("The Apache License, Version 2.0")
.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
.build();
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/ImsReturnMaterialDefectiveProductsApi.java
浏览文件 @ cdce820c
......@@ -68,45 +68,45 @@ public class ImsReturnMaterialDefectiveProductsApi implements web_api {
}
/*查询needLists所有数据的父单据的FEntryID*/
// public List<String> queryFatherFEntryIDs(List<Map<String, Object>> needLists,List<Map<String, Object>> SelectFatherFentryIdFailLists)
// {
// List<String> Father_FEntryIDs = new ArrayList<>(); //父单据FEntryID
// for (Map<String, Object> maps : needLists) {
// ImsReturnMaterialDefectiveProducts imsReturnMaterialDefectiveProducts = JSON.parseObject(JSON.toJSONString(maps), ImsReturnMaterialDefectiveProducts.class);//map转为实体类对象
// //查询是否有FEntryID传入，没有就其他方法查询出
// if (ObjectUtils.isEmpty(maps.get("SEQ_ENTRY_CODE"))) {
// //根据父单据编码和行号(ERP工单行号)在数据库同步表查出父单据的FEntryID
// List<List<Object>> FEntryIDlist = categoryDao.select_Father_FentryId(Father_FEnrtyID,maps, Father_sFormId,KingdeeLogName+"父单据行内码查询");
// String FEntryID="0";
// //过滤掉查询不到FEntryID的数据返回"0"
// if(!ObjectUtils.isEmpty(FEntryIDlist)) {
// if (FEntryIDlist.size()>=Integer.valueOf(ImsPurchaseOrder.getPoSeq())) {
// FEntryID = FEntryIDlist.get(Integer.valueOf(ImsPurchaseOrder.getPoSeq()) - 1).get(0).toString();
// }
// }
// else
// {
// FEntryID="1";
// maps.put("notExitFbillNo",true);
// SelectFatherFentryIdFailLists.add(maps);
// }
// //返回FEntryID默认值0说明查不到FEntryID
// if(FEntryID.equals("0"))
// {
// //查询FEntryID失败后要返结果的lists
// SelectFatherFentryIdFailLists.add(maps);
// }
// else
// {
// Father_FEntryIDs.add(FEntryID);
// maps.put(maps.get(ThreadLocalConfig.get().get("wipOrde")).toString()+maps.get(ThreadLocalConfig.get().get("SEQ")).toString(),FEntryID);
// }
//
// } else {
// String FEntryID = maps.get("SEQ_ENTRY_CODE").toString();
// Father_FEntryIDs.add(FEntryID);
// }
// }
// return Father_FEntryIDs;
// }
public List<String> queryFatherFEntryIDs(List<Map<String, Object>> needLists,List<Map<String, Object>> SelectFatherFentryIdFailLists)
{
List<String> Father_FEntryIDs = new ArrayList<>(); //父单据FEntryID
for (Map<String, Object> maps : needLists) {
ImsReturnMaterialDefectiveProducts imsReturnMaterialDefectiveProducts = JSON.parseObject(JSON.toJSONString(maps), ImsReturnMaterialDefectiveProducts.class);//map转为实体类对象
//查询是否有FEntryID传入，没有就其他方法查询出
if (ObjectUtils.isEmpty(maps.get("ERP_SIC"))) {
//根据父单据编码和行号(ERP工单行号)在数据库同步表查出父单据的FEntryID
List<List<Object>> FEntryIDlist = categoryDao.select_Father_FentryId(Father_FEnrtyID,maps, Father_sFormId,KingdeeLogName+"父单据行内码查询");
String FEntryID="0";
//过滤掉查询不到FEntryID的数据返回"0"
if(!ObjectUtils.isEmpty(FEntryIDlist)) {
if (FEntryIDlist.size()>=Integer.valueOf(imsReturnMaterialDefectiveProducts.getErpSeq())) {
FEntryID = FEntryIDlist.get(Integer.valueOf(imsReturnMaterialDefectiveProducts.getErpSeq()) - 1).get(0).toString();
}
}
else
{
FEntryID="1";
maps.put("notExitFbillNo",true);
SelectFatherFentryIdFailLists.add(maps);
}
//返回FEntryID默认值0说明查不到FEntryID
if(FEntryID.equals("0"))
{
//查询FEntryID失败后要返结果的lists
SelectFatherFentryIdFailLists.add(maps);
}
else
{
Father_FEntryIDs.add(FEntryID);
maps.put(maps.get(ThreadLocalConfig.get().get("wipOrde")).toString()+maps.get(ThreadLocalConfig.get().get("SEQ")).toString(),FEntryID);
}
} else {
String FEntryID = maps.get("ERP_SIC").toString();
Father_FEntryIDs.add(FEntryID);
}
}
return Father_FEntryIDs;
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ImsMiscellaneousIssueServiceImpl.java
浏览文件 @ cdce820c
......@@ -93,13 +93,16 @@ public class ImsMiscellaneousIssueServiceImpl extends ServiceImpl<ImsMiscellaneo
}
//判断需要修改的needLists里面有没有元素，有元素说明有东西未修改过，没有说明添加进来的数据都已经修改过了
List<String> Father_FEntryIDs=new ArrayList<>();
if(!ObjectUtils.isEmpty(needLists)) {
Father_FEntryIDs = imsMiscellaneousIssueApi.queryFatherFEntryIDs(needLists, SelectFatherFentryIdFailLists);
SelectFatherFentryIdFailResult=ResultSplitTwo(SelectFatherFentryIdFailLists);
}
if(!CollectionUtils.isEmpty(SelectFatherFentryIdFailResult)) {
throw new kingdeeException("操作失败!", SelectFatherFentryIdFailResult,code);
}
//下推失败返回结果
List<String> pushResultLists=new ArrayList<>();
List<String> AddResultLists=new ArrayList();
......@@ -108,6 +111,7 @@ public class ImsMiscellaneousIssueServiceImpl extends ServiceImpl<ImsMiscellaneo
org.jeecg.modules.iost.ims.entity.KingdeeResultObject.AddResultObject.Result result=imsMiscellaneousIssueApi.push(needLists,Father_FEntryIDs);
pushResultLists = ResultSplitThree(result);
if(!CollectionUtils.isEmpty(pushResultLists)) {
System.out.println("dsadssad"+needLists);
throw new kingdeeException("操作失败!下推失败!", pushResultLists,code);
}
//查询子单据行内码maps.get("AUDIT_ID").toString()+maps.get("AUDIT_SEQ").toString()
......@@ -133,7 +137,10 @@ public class ImsMiscellaneousIssueServiceImpl extends ServiceImpl<ImsMiscellaneo
if(!CollectionUtils.isEmpty(AddResultLists)) {
throw new kingdeeException("操作失败!修改失败!", AddResultLists,code); }
}
return null;
//保存实体类
this.saveBatch(imsMiscellaneousIssues);
ThreadLocalConfig.remove();
return imsMiscellaneousIssues.get(0).getFbillNo();
}
public List<String> ResultSplitOne(List<ImsMiscellaneousIssue> repeatLists)
......@@ -159,6 +166,7 @@ public class ImsMiscellaneousIssueServiceImpl extends ServiceImpl<ImsMiscellaneo
List<String> rustList=new ArrayList<>();
List<String> rustListAfter=new ArrayList<>();
for (Map<String, Object> queue_idRepeatResultMap : SelectFatherFentryIdFailLists) {
System.out.println("dsads "+queue_idRepeatResultMap.get("notExitFbillNo"));
if(!ObjectUtils.isEmpty(queue_idRepeatResultMap.get("notExitFbillNo"))&&Boolean.valueOf(queue_idRepeatResultMap.get("notExitFbillNo").toString())==true)
{
String queue_id = queue_idRepeatResultMap.get("QUEUE_ID").toString();
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ImsReturnMaterialDefectiveProductsServiceImpl.java
浏览文件 @ cdce820c
......@@ -38,8 +38,8 @@ public class ImsReturnMaterialDefectiveProductsServiceImpl extends ServiceImpl<I
this.imsLogName = "生产退料单"; //ims日志-name(excal表里面金蝶那一列名字)
this.imsLogOZTNmae = "不良品退料";//ims日志对应欧智通的标识字段(excal表里面欧智通那一列名字)
this.DocType = "BS0051"; //调用者传入的标识
this.SEQ = "PO_SEQ"; //父单据行号，一般默认是这个字符串(有些单据是AUDIT_SEQ)
this.wipOrde = "PO_CODE"; //父亲单据工单编号或者行内码
this.SEQ = "ERP_SEQ"; //父单据行号，一般默认是这个字符串(有些单据是AUDIT_SEQ)
this.wipOrde = "ERP_SIC"; //父亲单据工单编号或者行内码
}
@Override
......@@ -89,14 +89,14 @@ public class ImsReturnMaterialDefectiveProductsServiceImpl extends ServiceImpl<I
throw new kingdeeException("操作失败!", queue_idRepeatResult,code);
}
//判断需要修改的needLists里面有没有元素，有元素说明有东西未修改过，没有说明添加进来的数据都已经修改过了
// List<String> Father_FEntryIDs=new ArrayList<>();
// if(!ObjectUtils.isEmpty(needLists)) {
// Father_FEntryIDs = imsReturnMaterialDefectiveProductsApi.queryFatherFEntryIDs(needLists, SelectFatherFentryIdFailLists);
// SelectFatherFentryIdFailResult=ResultSplitTwo(SelectFatherFentryIdFailLists);
// }
// if(!CollectionUtils.isEmpty(SelectFatherFentryIdFailResult)) {
// throw new kingdeeException("操作失败!", SelectFatherFentryIdFailResult,code);
// }
List<String> Father_FEntryIDs=new ArrayList<>();
if(!ObjectUtils.isEmpty(needLists)) {
Father_FEntryIDs = imsReturnMaterialDefectiveProductsApi.queryFatherFEntryIDs(needLists, SelectFatherFentryIdFailLists);
SelectFatherFentryIdFailResult=ResultSplitTwo(SelectFatherFentryIdFailLists);
}
if(!CollectionUtils.isEmpty(SelectFatherFentryIdFailResult)) {
throw new kingdeeException("操作失败!", SelectFatherFentryIdFailResult,code);
}
return null;
}
......
jeecg-boot-module-system/src/main/resources/banner.txt
浏览文件 @ cdce820c
${AnsiColor.BRIGHT_BLUE}
(_) | | | |
_ ___ ___ ___ __ _ ______| |__ ___ ___ | |_
| |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __|
| | __/ __/ (_| (_| | | |_) | (_) | (_) | |_
| |\___|\___|\___\__, | |_.__/ \___/ \___/ \__|
_/ | __/ |
|__/ |___/
${AnsiColor.BRIGHT_GREEN}
Jeecg Boot Version: 2.3
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论