Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
O
OZT-Integration
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
许俊
OZT-Integration
Commits
5ff8e5ba
提交
5ff8e5ba
authored
10月 23, 2023
作者:
魏松生
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test-2
上级
ce8148be
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
12 行增加
和
2 行删除
+12
-2
CategoryDao.java
...main/java/org/jeecg/modules/iost/ims/Dao/CategoryDao.java
+2
-1
WebApi.java
...in/java/org/jeecg/modules/iost/ims/controller/WebApi.java
+1
-0
BillOfMaterialKingDeeApi.java
...modules/iost/ims/kingdeeapi/BillOfMaterialKingDeeApi.java
+3
-1
BillOfMaterialServerImpl.java
...dules/iost/ims/service/impl/BillOfMaterialServerImpl.java
+6
-0
没有找到文件。
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/Dao/CategoryDao.java
浏览文件 @
5ff8e5ba
...
@@ -874,10 +874,11 @@ public class CategoryDao {
...
@@ -874,10 +874,11 @@ public class CategoryDao {
String
result2
=
null
;
String
result2
=
null
;
JSONObject
responseStatus
=
null
;
JSONObject
responseStatus
=
null
;
try
{
try
{
log
.
info
(
"result_"
+
String
.
valueOf
(
result
));
if
(
result
)
{
if
(
result
)
{
result2
=
client
.
execute
(
"LQKJ.ERPWebApi.Stub.CustomWebApiService.PushAndSave,LQKJ.ERPWebApi.Stub"
,
new
Object
[]{
data
},
String
.
class
);
result2
=
client
.
execute
(
"LQKJ.ERPWebApi.Stub.CustomWebApiService.PushAndSave,LQKJ.ERPWebApi.Stub"
,
new
Object
[]{
data
},
String
.
class
);
System
.
out
.
println
(
result2
);
log
.
info
(
"result2_"
+
String
.
valueOf
(
result2
)
);
//记录修改金蝶云数据的请求和响应信息
//记录修改金蝶云数据的请求和响应信息
KingdeeLogUtil
kingdeeLogUtil
=
new
KingdeeLogUtil
();
KingdeeLogUtil
kingdeeLogUtil
=
new
KingdeeLogUtil
();
kingdeeLogUtil
.
KingdeeLog3
(
JsonUtil
.
toString
(
data
),
result2
,
KingdeeLogName
);
kingdeeLogUtil
.
KingdeeLog3
(
JsonUtil
.
toString
(
data
),
result2
,
KingdeeLogName
);
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/WebApi.java
浏览文件 @
5ff8e5ba
...
@@ -310,6 +310,7 @@ public class WebApi {
...
@@ -310,6 +310,7 @@ public class WebApi {
result
=
imsSalOutStockService
.
audit
(
request
.
getData
(),
request
.
getDocType
());
result
=
imsSalOutStockService
.
audit
(
request
.
getData
(),
request
.
getDocType
());
}
else
if
(
request
.
getDocType
().
equals
(
"BS_MOMN_CHANGE"
))
{
//生产用料清单
}
else
if
(
request
.
getDocType
().
equals
(
"BS_MOMN_CHANGE"
))
{
//生产用料清单
//测试生产用料清单
//测试生产用料清单
log
.
info
(
"wss_调用了生产用料清单:"
+
String
.
valueOf
(
request
.
getData
()));
System
.
out
.
println
(
"AAAA--调用了生产用料清单"
);
System
.
out
.
println
(
"AAAA--调用了生产用料清单"
);
result
=
billOfMaterialServer
.
setData
(
request
.
getData
(),
request
.
getDocType
());
result
=
billOfMaterialServer
.
setData
(
request
.
getData
(),
request
.
getDocType
());
}
else
{
}
else
{
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/BillOfMaterialKingDeeApi.java
浏览文件 @
5ff8e5ba
package
org
.
jeecg
.
modules
.
iost
.
ims
.
kingdeeapi
;
package
org
.
jeecg
.
modules
.
iost
.
ims
.
kingdeeapi
;
import
lombok.extern.slf4j.Slf4j
;
import
org.jeecg.modules.iost.ims.Dao.CategoryDao
;
import
org.jeecg.modules.iost.ims.Dao.CategoryDao
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
...
@@ -15,6 +16,7 @@ import java.util.stream.Collectors;
...
@@ -15,6 +16,7 @@ import java.util.stream.Collectors;
* @author Inori
* @author Inori
*/
*/
@Component
@Component
@Slf4j
public
class
BillOfMaterialKingDeeApi
{
public
class
BillOfMaterialKingDeeApi
{
@Autowired
@Autowired
...
@@ -32,7 +34,7 @@ public class BillOfMaterialKingDeeApi {
...
@@ -32,7 +34,7 @@ public class BillOfMaterialKingDeeApi {
data
.
put
(
"IsVerifyBaseDataField"
,
true
);
data
.
put
(
"IsVerifyBaseDataField"
,
true
);
data
.
put
(
"Model"
,
imsToKingDee
(
lists
));
data
.
put
(
"Model"
,
imsToKingDee
(
lists
));
//测试生产用料清单
//测试生产用料清单
System
.
out
.
println
(
"
addTwo---data:"
+
data
);
log
.
info
(
"wss_
addTwo---data:"
+
data
);
return
categoryDao
.
addReturnResult02
(
KING_DEE_LOG_NAME
,
data
);
return
categoryDao
.
addReturnResult02
(
KING_DEE_LOG_NAME
,
data
);
}
}
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/BillOfMaterialServerImpl.java
浏览文件 @
5ff8e5ba
package
org
.
jeecg
.
modules
.
iost
.
ims
.
service
.
impl
;
package
org
.
jeecg
.
modules
.
iost
.
ims
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
lombok.extern.slf4j.Slf4j
;
import
org.jeecg.common.exception.kingdeeException
;
import
org.jeecg.common.exception.kingdeeException
;
import
org.jeecg.common.util.ThreadLocalConfig
;
import
org.jeecg.common.util.ThreadLocalConfig
;
import
org.jeecg.modules.iost.ims.Util.ImsLogUtil
;
import
org.jeecg.modules.iost.ims.Util.ImsLogUtil
;
...
@@ -19,6 +20,7 @@ import java.util.stream.Collectors;
...
@@ -19,6 +20,7 @@ import java.util.stream.Collectors;
* @author Inori
* @author Inori
*/
*/
@Service
@Service
@Slf4j
public
class
BillOfMaterialServerImpl
implements
IBillOfMaterialServer
{
public
class
BillOfMaterialServerImpl
implements
IBillOfMaterialServer
{
@Autowired
@Autowired
...
@@ -38,6 +40,7 @@ public class BillOfMaterialServerImpl implements IBillOfMaterialServer {
...
@@ -38,6 +40,7 @@ public class BillOfMaterialServerImpl implements IBillOfMaterialServer {
new
ImsLogUtil
().
ImsRequestLog
(
JSON
.
toJSONString
(
list
),
"生产用料清单"
,
"生产用料清单"
,
docType
);
new
ImsLogUtil
().
ImsRequestLog
(
JSON
.
toJSONString
(
list
),
"生产用料清单"
,
"生产用料清单"
,
docType
);
String
addTwo
=
billOfMaterialKingDeeApi
.
addTwo
(
list
);
String
addTwo
=
billOfMaterialKingDeeApi
.
addTwo
(
list
);
log
.
info
(
"addTwo_"
+
String
.
valueOf
(
addTwo
));
Map
<
String
,
Object
>
map
=
JsonUtil
.
toMap
(
addTwo
,
String
.
class
,
Object
.
class
);
Map
<
String
,
Object
>
map
=
JsonUtil
.
toMap
(
addTwo
,
String
.
class
,
Object
.
class
);
if
(
CollectionUtils
.
isEmpty
(
map
))
{
if
(
CollectionUtils
.
isEmpty
(
map
))
{
throw
new
kingdeeException
(
"操作失败!更新失败!"
,
addTwo
,
docType
);
throw
new
kingdeeException
(
"操作失败!更新失败!"
,
addTwo
,
docType
);
...
@@ -45,6 +48,7 @@ public class BillOfMaterialServerImpl implements IBillOfMaterialServer {
...
@@ -45,6 +48,7 @@ public class BillOfMaterialServerImpl implements IBillOfMaterialServer {
if
(!
CollectionUtils
.
isEmpty
(
map
)
&&
!
"0000"
.
equals
(
map
.
get
(
"resultCode"
)))
{
if
(!
CollectionUtils
.
isEmpty
(
map
)
&&
!
"0000"
.
equals
(
map
.
get
(
"resultCode"
)))
{
List
<
Object
>
tempList
=
JsonUtil
.
toList
(
JsonUtil
.
toString
(
map
.
get
(
"resultData"
)),
Object
.
class
);
List
<
Object
>
tempList
=
JsonUtil
.
toList
(
JsonUtil
.
toString
(
map
.
get
(
"resultData"
)),
Object
.
class
);
List
<
String
>
msgList
=
tempList
.
stream
().
map
(
m
->
JsonUtil
.
toMap
(
JsonUtil
.
toString
(
m
),
String
.
class
,
Object
.
class
).
get
(
"msg"
).
toString
()).
collect
(
Collectors
.
toList
());
List
<
String
>
msgList
=
tempList
.
stream
().
map
(
m
->
JsonUtil
.
toMap
(
JsonUtil
.
toString
(
m
),
String
.
class
,
Object
.
class
).
get
(
"msg"
).
toString
()).
collect
(
Collectors
.
toList
());
log
.
info
(
"wss_msgList"
+
String
.
valueOf
(
msgList
));
String
message
;
String
message
;
if
(!
CollectionUtils
.
isEmpty
(
msgList
))
{
if
(!
CollectionUtils
.
isEmpty
(
msgList
))
{
message
=
String
.
join
(
", "
,
msgList
);
message
=
String
.
join
(
", "
,
msgList
);
...
@@ -55,7 +59,9 @@ public class BillOfMaterialServerImpl implements IBillOfMaterialServer {
...
@@ -55,7 +59,9 @@ public class BillOfMaterialServerImpl implements IBillOfMaterialServer {
}
}
List
<
Object
>
tempList
=
JsonUtil
.
toList
(
JsonUtil
.
toString
(
map
.
get
(
"resultData"
)),
Object
.
class
);
List
<
Object
>
tempList
=
JsonUtil
.
toList
(
JsonUtil
.
toString
(
map
.
get
(
"resultData"
)),
Object
.
class
);
log
.
info
(
"tempList_"
+
String
.
valueOf
(
tempList
));
List
<
String
>
codeList
=
tempList
.
stream
().
map
(
m
->
JsonUtil
.
toMap
(
JsonUtil
.
toString
(
m
),
String
.
class
,
Object
.
class
).
get
(
"code"
).
toString
()).
collect
(
Collectors
.
toList
());
List
<
String
>
codeList
=
tempList
.
stream
().
map
(
m
->
JsonUtil
.
toMap
(
JsonUtil
.
toString
(
m
),
String
.
class
,
Object
.
class
).
get
(
"code"
).
toString
()).
collect
(
Collectors
.
toList
());
log
.
info
(
"codeList_"
+
String
.
valueOf
(
codeList
));
return
String
.
join
(
", "
,
codeList
);
return
String
.
join
(
", "
,
codeList
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论