Commit Graph

547 Commits

Author SHA1 Message Date
yuqh c57ca0f43c 1 2024-11-05 15:14:51 +08:00
yuqh 77dc2936b1 1 2024-11-05 15:13:10 +08:00
yuqh 740c31fe5c Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into kjs
# Conflicts:
#	buildpackage/pom.xml
#	buildpackage/src/main/resources/application-dongj.yml
#	buildpackage/src/main/resources/application-kjs.yml
#	buildpackage/src/test/java/com/hzya/frame/temButtom.java
#	pom.xml
#	service/src/main/java/com/hzya/frame/dingtalk/service/IDingTalkService.java
#	service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkServiceImpl.java
#	service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
#	service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java
#	webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java
2024-11-05 15:06:07 +08:00
yuqh 00fec98bed 新增对接CRM插件 2024-11-05 15:01:55 +08:00
yuqh fa3202304b Merge remote-tracking branch 'origin/dongj' into dongj 2024-11-05 14:29:40 +08:00
yuqh 2400d08a93 新增对接CRM插件 2024-11-05 14:29:29 +08:00
lvleigang 4d73583183 分组类型查询单据 2024-11-04 08:39:02 +08:00
lvleigang 365b53a728 Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-11-04 08:38:32 +08:00
lvleigang f845f4ed26 分组类型查询单据 2024-11-04 08:38:23 +08:00
476474485@qq.com 2c6d81919b 调整关联查询入库单,没有过滤删除状态,修改为dr=0 2024-11-02 11:41:31 +08:00
yuqh 87d554ba64 新增对接CRM插件 2024-11-01 15:13:46 +08:00
lvleigang 7570880778 分组类型查询单据 2024-11-01 09:14:55 +08:00
476474485@qq.com 0fc94df996 修改销售发票未审核同步U8C 2024-11-01 08:28:48 +08:00
lvleigang f17ade4145 还原转发接口 2024-10-18 09:23:50 +08:00
lvleigang d1687abd91 东进销售订单删除接口,新增删除oa销售合同接口 2024-10-18 09:16:15 +08:00
lvleigang ef957a0055 Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-10-18 08:52:18 +08:00
yuqh f15c2f1d9b 销售订单同步OA代码 2024-10-17 16:33:46 +08:00
yuqh 11431c76b7 销售订单同步OA代码 2024-10-17 16:33:26 +08:00
lvleigang bb5aa51255 修改请求 2024-10-17 11:28:03 +08:00
lvleigang 937395744e 修改请求 2024-10-17 10:29:31 +08:00
yuqh f11dba5d41 Merge remote-tracking branch 'origin/dongj' into dongj 2024-10-14 15:21:05 +08:00
yuqh c8d95fe335 修复获取银行流水报错了不继续执行问题 2024-10-14 15:20:47 +08:00
xiang2lin 9f748783bc fix: 销售开票审批人修改 改成15715849962 2024-09-30 11:39:20 +08:00
yuqh 59ce4792f9 1 2024-09-26 10:24:34 +08:00
yuqh 42deacdc7d 1 2024-09-24 14:51:58 +08:00
yuqh c814e0c475 调整收款单推送U8C字段 2024-09-24 09:38:37 +08:00
yuqh 8a3dcc44ab 调整收款单推送U8C字段 2024-09-19 11:20:33 +08:00
yuqh f1604d68eb 修复服务器调用错误 2024-09-18 08:51:30 +08:00
yuqh 00eebd3fb5 修复服务器调用错误 2024-09-18 08:50:13 +08:00
yuqh d182dec59c 修复主数据显示问题 2024-09-14 14:28:20 +08:00
yuqh 6055a0954c 调整主数据下发条数 2024-09-13 10:48:05 +08:00
yuqh 08c8cb3e30 修复主数据新增接报错 2024-09-12 13:37:34 +08:00
yuqh 553ea0376c Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-09-11 14:36:40 +08:00
lvleigang 504c9e54c0 修改主数据保存信息 2024-09-11 14:07:03 +08:00
lvleigang 54867aee2c Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev 2024-09-11 14:05:20 +08:00
lvleigang 17518aa2d4 修改主数据保存信息 2024-09-11 14:04:44 +08:00
yuqh d7d1ef5078 修复配置文件读取不到 启动不成功问题 2024-09-10 16:32:28 +08:00
yuqh 8ed593f536 OA无流程表单公用删除接口 2024-09-10 09:42:58 +08:00
yuqh 916a133c0c OA无流程表单公用删除接口 2024-09-10 08:45:52 +08:00
yuqh 6a45c88a18 1 2024-09-10 08:42:02 +08:00
yuqh c5eaaf9207 OA无流程表单公用删除接口 2024-09-10 08:34:43 +08:00
lvleigang d6bdd3605f u8c封装接口,测试修改 2024-09-09 17:32:47 +08:00
yuqh 72f98441a1 Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-09-09 15:28:54 +08:00
lvleigang c78e10f059 esb添加消息推送方法 2024-09-09 14:20:48 +08:00
yuqh ed40e4f4c8 Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj
# Conflicts:
#	buildpackage/src/main/resources/application-xel.yml
#	buildpackage/src/test/java/com/hzya/frame/temButtom.java
#	service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java
#	service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
2024-09-09 14:13:40 +08:00
lvleigang 7af6143514 Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev 2024-09-09 11:57:03 +08:00
username 927f8c5a7b 推送消息日志记录 2024-09-07 16:30:36 +08:00
username c2ad1e3ea3 预警配置,预警接口,定时插件推送消息,消息模版配置,推送消息日志 2024-09-07 16:13:21 +08:00
username 24ab9a9dc1 Revert "预警配置,预警接口,定时插件推送消息,消息模版配置,推送消息日志"
This reverts commit 37b66cee8b.
2024-09-07 16:07:53 +08:00
username 37b66cee8b 预警配置,预警接口,定时插件推送消息,消息模版配置,推送消息日志 2024-09-07 16:02:27 +08:00