Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
E
EIP-Integration
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
李炎
EIP-Integration
Commits
597d180c
提交
597d180c
authored
9月 26, 2021
作者:
李炎
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改
上级
17ae6b27
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
44 行增加
和
41 行删除
+44
-41
Swagger2Config.java
...common/src/main/java/org/jeecg/config/Swagger2Config.java
+2
-2
MaterialinventoryTimed.java
...cg/modules/iost/API/TimedTask/MaterialinventoryTimed.java
+1
-1
PhysicalIDTimed.java
...org/jeecg/modules/iost/API/TimedTask/PhysicalIDTimed.java
+1
-1
ProductInventoryTimed.java
...ecg/modules/iost/API/TimedTask/ProductInventoryTimed.java
+1
-1
ProductionOrderTimed.java
...eecg/modules/iost/API/TimedTask/ProductionOrderTimed.java
+1
-1
ProductionSchedulingTimed.java
...modules/iost/API/TimedTask/ProductionSchedulingTimed.java
+1
-1
PurchaseorderTimed.java
.../jeecg/modules/iost/API/TimedTask/PurchaseorderTimed.java
+1
-1
ReserveStockTimed.java
...g/jeecg/modules/iost/API/TimedTask/ReserveStockTimed.java
+1
-1
SalesOrderTimed.java
...org/jeecg/modules/iost/API/TimedTask/SalesOrderTimed.java
+1
-1
SupplylistTimed.java
...org/jeecg/modules/iost/API/TimedTask/SupplylistTimed.java
+1
-1
PurchaseorderServiceImpl.java
...dules/iost/API/service/impl/PurchaseorderServiceImpl.java
+33
-30
没有找到文件。
jeecg-boot-base-common/src/main/java/org/jeecg/config/Swagger2Config.java
浏览文件 @
597d180c
...
...
@@ -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("
团队")
.
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/API/TimedTask/MaterialinventoryTimed.java
浏览文件 @
597d180c
...
...
@@ -47,7 +47,7 @@ public class MaterialinventoryTimed implements Job {
// }
/**设置定时器功能
* */
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000*60)
public
void
Materialinventory
()
throws
IOException
,
ParseException
{
iMaterialinventoryService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/PhysicalIDTimed.java
浏览文件 @
597d180c
...
...
@@ -23,7 +23,7 @@ public class PhysicalIDTimed implements Job {
IPhysicalIDerrorService
physicalIDService
;
/**测试定时*/
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000*60)
public
void
Materialinventory
()
throws
IOException
,
ParseException
{
physicalIDService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/ProductInventoryTimed.java
浏览文件 @
597d180c
...
...
@@ -27,7 +27,7 @@ public class ProductInventoryTimed implements Job {
IProductInventoryService
productInventoryService
;
/**测试定时*/
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000*60)
public
void
Materialinventory
()
throws
IOException
,
ParseException
{
productInventoryService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/ProductionOrderTimed.java
浏览文件 @
597d180c
...
...
@@ -19,7 +19,7 @@ import java.text.ParseException;
public
class
ProductionOrderTimed
implements
Job
{
@Autowired
IProductionOrderService
productionOrderService
;
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000*60)
public
void
job
()
throws
ParseException
{
productionOrderService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/ProductionSchedulingTimed.java
浏览文件 @
597d180c
...
...
@@ -19,7 +19,7 @@ import java.text.ParseException;
public
class
ProductionSchedulingTimed
implements
Job
{
@Autowired
IProductionSchedulingService
productionSchedulingService
;
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000*60)
public
void
job
()
throws
ParseException
{
productionSchedulingService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/PurchaseorderTimed.java
浏览文件 @
597d180c
...
...
@@ -25,7 +25,7 @@ public class PurchaseorderTimed implements Job {
/**
* 测试定时
*/
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000 * 60)
public
void
Materialinventory
()
throws
IOException
,
ParseException
{
iPurchaseorderService
.
synchronizationList
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/ReserveStockTimed.java
浏览文件 @
597d180c
...
...
@@ -29,7 +29,7 @@ public class ReserveStockTimed implements Job {
/**
* 测试定时
*/
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000 * 60)
public
void
Materialinventory
()
throws
IOException
,
ParseException
{
reserveStockService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/SalesOrderTimed.java
浏览文件 @
597d180c
...
...
@@ -24,7 +24,7 @@ import java.io.IOException;
public
class
SalesOrderTimed
implements
Job
{
@Autowired
ISalesOrderService
salesOrderService
;
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000*60)
public
void
job
()
throws
ParseException
{
salesOrderService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/SupplylistTimed.java
浏览文件 @
597d180c
...
...
@@ -24,7 +24,7 @@ import java.text.ParseException;
public
class
SupplylistTimed
implements
Job
{
@Autowired
ISupplyListIService
supplyListIService
;
//
@Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
@Scheduled
(
cron
=
"0 0 1 * * ?"
)
//cron表达式每天凌晨一点
// @Scheduled(fixedDelay = 1000*60)
public
void
Materialinventory
()
throws
IOException
,
ParseException
{
supplyListIService
.
synchronization
(
null
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/PurchaseorderServiceImpl.java
浏览文件 @
597d180c
...
...
@@ -73,27 +73,28 @@ public class PurchaseorderServiceImpl extends ServiceImpl<PurchaseorderMapper, P
* 返回值转json
*/
Map
map
=
null
;
if
(
object
==
null
)
{
if
(
null
==
object
)
{
map
=
new
HashMap
()
{{
put
(
"modifyStartTime"
,
getTime
());
}};
}
else
{
map
=
object
;
}
JSONObject
jsonObject
=
JSONObject
.
fromObject
(
purchaseorderApi
.
selectList
(
map
));
if
(
jsonObject
.
get
(
"success"
)
==
null
)
{
//请求国网的返回信息
JSONObject
resultValue
=
JSONObject
.
fromObject
(
jsonObject
.
get
(
"resultValue"
));
Object
data
=
resultValue
.
get
(
"data"
);
//获取返回数据的 data对象
List
<
Map
<
String
,
Object
>>
list
=
com
.
alibaba
.
fastjson
.
JSONObject
.
parseObject
(
data
.
toString
(),
List
.
class
);
//格式转换
if
(
list
==
null
&&
list
.
size
()
==
0
)
return
false
;
if
(
null
==
list
&&
0
==
list
.
size
()
)
return
false
;
//记录请求国网的返回信息
Map
<
Boolean
,
String
>
booleanStringMap
=
gridErrorService
.
setGridError
(
jsonObject
,
JsonUtil
.
Mapjson
(
map
),
BusinessNo
);
String
ReturnProcessId
=
null
;
if
(
booleanStringMap
.
containsKey
(
true
))
{
ReturnProcessId
=
booleanStringMap
.
get
(
true
);
}
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
if
(
null
!=
list
&&
0
<
list
.
size
()
)
{
success
=
this
.
addSalesOrderWebapi
(
list
,
ReturnProcessId
);
}
}
else
{
...
...
@@ -155,7 +156,7 @@ public class PurchaseorderServiceImpl extends ServiceImpl<PurchaseorderMapper, P
*/
public
Boolean
addSalesOrderWebapi
(
List
<
Map
<
String
,
Object
>>
list
,
String
ReturnProcessId
)
throws
ParseException
{
List
<
Purchaseorder
>
purchaseordersAdd
=
new
ArrayList
<>();
Boolean
fn
=
false
;
Boolean
fn
=
false
;
for
(
Map
<
String
,
Object
>
map
:
list
)
{
if
(
map
.
get
(
"prjname"
)
==
null
||
...
...
@@ -184,33 +185,35 @@ public class PurchaseorderServiceImpl extends ServiceImpl<PurchaseorderMapper, P
boolean
save
=
this
.
saveBatch
(
purchaseordersAdd
);
//记录明细
return
save
;
}
public
Boolean
manual
(
Map
<
String
,
Object
>
map
,
String
ReturnProcessId
)
throws
ParseException
{
Boolean
fn
=
false
;
if
(
map
.
get
(
"prjname"
)
==
null
||
map
.
get
(
"materialcode"
)
==
null
||
map
.
get
(
"amount"
)
==
null
||
Integer
.
parseInt
(
map
.
get
(
"amount"
).
toString
())
<=
0
)
{
}
else
{
JSONObject
model
=
JSONObject
.
fromObject
(
map
);
//转换数据格式
Map
<
String
,
Object
>
SAL_SaleOrder
=
FieldConversion
.
nameAPI
(
model
);
//拼接需要的数据 字段转换
String
rswebapi
=
salesOrderWebapi
.
add
(
SAL_SaleOrder
);
//同步到金蝶
System
.
out
.
println
(
rswebapi
);
JSONObject
Result
=
JSONObject
.
fromObject
(
rswebapi
);
//
JSONObject
ResponseStatus
=
JSONObject
.
fromObject
(
JSONObject
.
fromObject
(
Result
.
get
(
"Result"
)).
get
(
"ResponseStatus"
));
//记录金蝶日志
setKingdeeJournalReturnProcess
(
JsonUtil
.
Objectjson
(
SAL_SaleOrder
),
ReturnProcessId
,
rswebapi
,
JsonUtil
.
Objectjson
(
map
));
List
<
Map
<
String
,
String
>>
SuccessEntitys
=
(
List
<
Map
<
String
,
String
>>)
ResponseStatus
.
get
(
"SuccessEntitys"
);
//金蝶云返回值SuccessEntitys
Map
<
String
,
String
>
stringStringMap
=
SuccessEntitys
.
get
(
0
);
if
(
stringStringMap
.
get
(
"Id"
)
!=
null
&&
stringStringMap
.
get
(
"Number"
)
!=
null
)
{
fn
=
true
;
map
.
put
(
"FId"
,
stringStringMap
.
get
(
"Id"
));
map
.
put
(
"FNumber"
,
stringStringMap
.
get
(
"Number"
));
//获取返回数据记录到记录明细
boolean
save
=
save
(
JSON
.
parseObject
(
JSON
.
toJSONString
(
map
),
Purchaseorder
.
class
));
}
}
return
fn
;
public
Boolean
manual
(
Map
<
String
,
Object
>
map
,
String
ReturnProcessId
)
throws
ParseException
{
Boolean
fn
=
false
;
if
(
map
.
get
(
"prjname"
)
==
null
||
map
.
get
(
"materialcode"
)
==
null
||
map
.
get
(
"amount"
)
==
null
||
Integer
.
parseInt
(
map
.
get
(
"amount"
).
toString
())
<=
0
)
{
}
else
{
JSONObject
model
=
JSONObject
.
fromObject
(
map
);
//转换数据格式
Map
<
String
,
Object
>
SAL_SaleOrder
=
FieldConversion
.
nameAPI
(
model
);
//拼接需要的数据 字段转换
String
rswebapi
=
salesOrderWebapi
.
add
(
SAL_SaleOrder
);
//同步到金蝶
System
.
out
.
println
(
rswebapi
);
JSONObject
Result
=
JSONObject
.
fromObject
(
rswebapi
);
//
JSONObject
ResponseStatus
=
JSONObject
.
fromObject
(
JSONObject
.
fromObject
(
Result
.
get
(
"Result"
)).
get
(
"ResponseStatus"
));
//记录金蝶日志
setKingdeeJournalReturnProcess
(
JsonUtil
.
Objectjson
(
SAL_SaleOrder
),
ReturnProcessId
,
rswebapi
,
JsonUtil
.
Objectjson
(
map
));
List
<
Map
<
String
,
String
>>
SuccessEntitys
=
(
List
<
Map
<
String
,
String
>>)
ResponseStatus
.
get
(
"SuccessEntitys"
);
//金蝶云返回值SuccessEntitys
Map
<
String
,
String
>
stringStringMap
=
SuccessEntitys
.
get
(
0
);
if
(
stringStringMap
.
get
(
"Id"
)
!=
null
&&
stringStringMap
.
get
(
"Number"
)
!=
null
)
{
fn
=
true
;
map
.
put
(
"FId"
,
stringStringMap
.
get
(
"Id"
));
map
.
put
(
"FNumber"
,
stringStringMap
.
get
(
"Number"
));
//获取返回数据记录到记录明细
boolean
save
=
save
(
JSON
.
parseObject
(
JSON
.
toJSONString
(
map
),
Purchaseorder
.
class
));
}
}
return
fn
;
}
//金蝶日志
public
Boolean
setKingdeeJournalReturnProcess
(
String
setRequest
,
String
ReturnProcessId
,
String
setResponse
,
String
ReturnProcessJson
)
throws
ParseException
{
boolean
ny
=
false
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论