9ec5e63da6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5b200f824f
软适配 WebService 功能开发
6 years ago
3eef8ea750
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
029d7eac62
软适配model
6 years ago
2d376575a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3c6d17a283
修改pojo数据类型
6 years ago
ccffe9b7bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c44a99eb40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
61a7985afc
提交 0905
6 years ago
5b97a9e0cb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
241a478f65
excel导出优化--单据状态显示枚举描述
6 years ago
8d8752b8b4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
89b0a4a68a
条码打印调试
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
f0fba5e23a
盘点枚举添加--excel导出
6 years ago
曾贞一
b7bd96fa44
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
64aed1f49c
开发 Restful 接口测试PDA
6 years ago
8f1ac3fdae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f370f377d4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ce78b170f
工作参数枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
0a3339ba8d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ff462900b7
枚举描述添加
6 years ago
2e8a70d8b4
pom版本还原--pojo
6 years ago
王杰
482159b322
mes-pcn定时任务枚举修改
6 years ago
53a08621fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
db4f6bcdb1
流程管家：添加作业记录明细（快速流程每一次扫条码都会生成一个新的移动单）
6 years ago
b760543b3b
excel通用导入优化
6 years ago
a5b01bbaae
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
69d2932ca4
http请求增加不需要设置请求内容枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
3a1cf7a2b7
判断属性是否有final修饰
6 years ago
b4b095c970
判断属性是否有final修饰
6 years ago
4d5c92df78
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
d5cfe77ac5
mes定时任务枚举
6 years ago
32502582c1
新增属性初始化
6 years ago
eadb86ce60
excel通用导入优化
6 years ago
fb3b8a033d
excel通用导入优化
6 years ago
7aec1fdb6a
添加工步类型枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7f3f39af06
提交
6 years ago
63c0f02f32
提交
6 years ago
146cf768d6
提交
6 years ago
5e06022e51
Merge remote-tracking branch 'remotes/origin/dev'
6 years ago
24a9d3ff2c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8a5337daad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
235a728c0e
andon
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
9c26f45cd5
明细状态枚举添加
6 years ago
王杰
2e86ff81d0
mes工作单元参数增加枚举
6 years ago
王杰
6929e88570
mes-pcn定时任务
6 years ago
曾贞一
ae12af551b
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
cfc0de67cf
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
057fa88904
revert
6 years ago
c6584a9437
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
368a3a1c66
mes枚举
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7740503a97
getByProperty查询到多条数据抛异常
6 years ago
1b06c1d07f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
5947f88da1
mes-pcn定时任务工作清单数据同步
6 years ago
b7e17c5451
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
2325d18660
软件适配器 认证参数接口
6 years ago
3bedf8fb8d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
6 years ago
953f593207
提交
6 years ago
592cd15add
调试枚举删除、库位导入工厂字段添加
6 years ago
曾贞一
25e7ca08d3
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7e5d2e1e56
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
1f1a9c39fc
异常国际化功能开发完成
6 years ago
曾贞一
5aceaca82d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9680112434
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
18aff86ea0
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
王杰
3b3ddd581a
mest条码生成规则最大值是否循环枚举
6 years ago
6d925d6b9f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a38347d2fb
revert
6 years ago
34e2c13b38
getByProperty获取到多条数据报错
6 years ago
c901f18f89
pom版本还原
6 years ago
c7842e63a1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f6b49bf31a
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9bea065f35
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
曾贞一
b10b967b73
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
884f3e1a96
合并代码
6 years ago
王杰
aebe742280
mes枚举增加关键件条码规则信息模块的绑定规则
6 years ago
d7b0f30d91
IMPP 平台功能功能优化 . 软适适配功能开发
6 years ago
88f735ff63
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5e72d98ad8
提交
6 years ago
4359f347c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1328dc7ddd
#Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
曾贞一
acd1e6cfb6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
ce70994a57
盘点 按照盘点差异类型汇总
6 years ago
a2a4dc6beb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
e83efe76e0
软件适配器 测试
6 years ago
0b13c6dd70
order by 列类型装换
6 years ago
f10ff69ce0
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
王杰
4f37dc42ef
pojo-mes-time-update-wangjie
6 years ago
1d55cd22a6
order by 列类型装换
6 years ago
39a00d3a19
order by 列类型装换
6 years ago
e8741ec364
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
1b30b927ce
自定义表单功能优化
6 years ago
曾贞一
e1cb06da5c
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
483ea59142
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ef1450e912
Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
b9d9d7402e
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7002ac5a8a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f5c0ca9383
软适配模型调整
6 years ago
c05e3b13c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
63d86a4b0d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ecba29948f
816 add method
6 years ago
69525fbaa9
表单菜单排序
6 years ago
曾贞一
fbe8544a02
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
cef48801df
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7455c6c640
软适配配置文件初始化
6 years ago
aee54acafc
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
46c710e559
表单功能优化，虚拟属性连表查询，时间格式化对接
6 years ago
6d99080069
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c986f7b2a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
9ee2901346
添加字典分组
...
优化redis资源键
6 years ago
66f49f3fdc
自定义表单功能调整
6 years ago
曾贞一
47d4a53706
Merge branch 'dev'
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
6 years ago
曾贞一
8b457c0618
DEV 合并 TEST pom.xml文件修改
6 years ago
4235184afc
Merge branch 'Process' into dev
6 years ago
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
6 years ago
24da688384
Merge branch 'test' into dev
6 years ago
31313baec9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
曾贞一
b3a0a71065
库存初始化信息
6 years ago
476d943a69
流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息
6 years ago
40fc36ef18
流程管家优化：快速提交流程手动提交校验
6 years ago
af7b2404dd
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
d8786d8132
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
fb07628555
Merge branch 'dev' into test
6 years ago
c1cff11c7c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
363d521c36
Merge branch 'test'
6 years ago
d45b7b77f3
Merge branch 'dev' into test
6 years ago
bb8078cb94
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f3d902a30
流程管家：提交检验+预回显优化；
...
直送发运JOB:#5132
6 years ago
750e4d75dc
添加 XStream 插件
6 years ago
bda52f76c6
软适配 Json 请求适配完成
6 years ago
b4dc0c254b
Merge branch 'test'
6 years ago
24bbd75c81
Merge branch 'dev' into test
6 years ago
曾贞一
c7571b4c66
IS_GENERAL_TASK 添加单据是否生成任务状态 撤销
6 years ago
60e6d51d35
流程管家2.0
6 years ago
19871c5f27
Merge branch 'test'
6 years ago
8f977719c0
Merge branch 'dev' into test
6 years ago
5a7ce32761
冲突
6 years ago
b5c204f873
软适配接口制作完成
6 years ago
562ea029fc
Merge branch 'test'
6 years ago
5c48b2eb79
Merge branch 'dev' into test
6 years ago
035a8b5924
定时任务日志信息优化
6 years ago
90439f55fd
添加 XStream 插件
6 years ago
c4db15db9b
添加 XStream 插件
6 years ago
47238f131b
Merge branch 'test'
6 years ago
8daa2789a4
Merge branch 'dev' into test
6 years ago
7181e85ba5
安灯导出实体注解
...
定时任务日志添加字段
6 years ago
6598a829e0
Merge branch 'dev'
6 years ago
ccf0764ee6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
812be94ed3
Merge branch 'dev' into test
6 years ago
7f35883b08
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
90fb9d3190
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
fb743ebafc
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
409cbb8492
Merge branch 'dev' into test
6 years ago
4a717ec544
直送发运JOB+交易处理程序（下线结算）逻辑变动
6 years ago
f4141fd2c6
Merge branch 'dev' into test
6 years ago
曾贞一
60feef4bb5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
2240819def
发泡打箱包装
6 years ago
6e2cf70951
库位校验枚举添加
6 years ago
49a936c660
Merge branch 'dev' into test
6 years ago
06bd10152c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7f1ef0bca7
自定义报表表单打通， 用户在线设置功能优化
6 years ago
d63974140d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
af2e1a811c
andon组织模型导入功能
...
andon删除关联数据校验
6 years ago
577e1372ab
Merge branch 'dev' into test
6 years ago
a064c6b84a
枚举新增条码类型
...
库存条码表新增字段
6 years ago
ad09180809
Merge branch 'dev' into test
6 years ago
c1ca7cbcae
Andon组织模型操作接口
...
Andon班次计算调整
6 years ago
4149183450
Merge branch 'dev' into test
6 years ago
c11cc65e8f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
d7b79c659c
WMS获取系统配置信息
6 years ago
0526fcf05c
Merge branch 'dev' into test
6 years ago
19afeb92b7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fea0d476a4
基础操作,数据补全
6 years ago
0e15934d16
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6a3662283b
枚举修改赋值
6 years ago
0ed90485a6
安灯基础数据导入导出
6 years ago
6ba7a43ea7
Merge branch 'dev'
6 years ago
4350a82043
1. 完善脚本引擎
6 years ago
353b8a37c5
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
e1824dbba4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c858475bd2
用户权限调整 部门权限调整完成
6 years ago
24f7ae3471
Merge branch 'test'
6 years ago
3a19888ddf
用户权限调整 岗位功能调整完成
6 years ago
53d34096f7
Merge branch 'dev' into test
6 years ago
8e39e6d9fb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
0041ce328e
定时删除日志
6 years ago
78cd5dc77e
用户权限调整
6 years ago
d9ef2677fb
Merge branch 'dev' into test
6 years ago
f4613c2f5c
Merge branch 'test'
6 years ago
1b1bc67c90
用户权限调整
6 years ago
61ecc2a74f
Merge branch 'dev' into test
6 years ago
fba99de795
枚举修改
6 years ago
d47c9f8650
合并冲突pojo
6 years ago
f0e0867e2c
库存移动pojo新增字段
6 years ago
a1f8ca3096
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d2839f6cf2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
58b067e3cc
库存报表存储区级联子存储区查询
6 years ago
5741bfa2e6
Merge branch 'test'
6 years ago
5bed1d27ec
Merge branch 'dev' into test
6 years ago
79b36a30a4
冲突合并
6 years ago
fe3d392e9b
新增枚举信息
...
移库单明细表冗余主表临时字段
新增物料表字段
6 years ago
f3eb8d2356
Merge branch 'dev' into test
6 years ago
541b40d182
合并代码
6 years ago
53135c27f5
Merge branch 'test'
6 years ago
b39d7038fa
Merge branch 'dev' into test
6 years ago
dec3743911
流程管家推队列查询条件没有封装
6 years ago
2cbc082c7b
动态对象 空数据处理
6 years ago
eeefb843b4
Merge branch 'test'
6 years ago
37b8755485
Merge branch 'dev' into test
6 years ago
d3deaa6081
安灯bug解决
...
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
6 years ago
e43c493463
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
994da92b4e
交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG
6 years ago
c02d22ecba
Merge branch 'test'
6 years ago
b18d393fe0
Merge branch 'dev' into test
6 years ago
e95db40c23
123
6 years ago
543171dfbb
Merge branch 'dev' into test
6 years ago
1ac5542541
动态表单分页功能完成
6 years ago
c436c8ee3d
Merge branch 'test'
6 years ago
e3354f52bd
Merge branch 'dev' into test
6 years ago
92daec97e3
枚举修改名字
6 years ago
b8730fac47
Merge branch 'dev' into test
6 years ago
ac5bf14d6b
动态表单动态操作 功能优化
6 years ago
15386ae5c2
枚举
6 years ago
628f1db31c
Merge branch 'dev' into test
6 years ago
ff9a5dcd17
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
98de08ba4a
文件上传优化
...
字段删除异常
日志添加索引
6 years ago
96264870c2
Merge branch 'dev' into test
6 years ago
efbe9dac9e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bf02cbf8a4
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
6 years ago
99710d5c20
Merge branch 'test'
6 years ago
9c38ed702a
Merge branch 'dev' into test
6 years ago
97adebba21
枚举新增 实体字段新增
6 years ago
3b1d19bbab
Merge branch 'dev' into test
6 years ago
a8dee4713a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
31f6f4deef
枚举字段新增AMP
...
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
6 years ago
1b569ff3a8
ERP同步标识枚举添加
6 years ago
f4bf536296
Merge branch 'test'
6 years ago
ee5a4f1dfe
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
0962b810ce
Json 转换精度丢失
6 years ago
5d2695a5cb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a551249165
Merge branch 'dev' into test
6 years ago
2e5b7466c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1b4e5143aa
用户单帐号多平台登录
6 years ago
364efedc42
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c783d9119c
任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法
6 years ago
d39c16c5d5
Merge branch 'test'
6 years ago
49d35f264e
Merge branch 'dev' into test
6 years ago
35f92b05e3
1. 修改ERP接口暂存表的字段，增加关联单据类型
6 years ago
1ee9cb24f2
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7861048e31
Merge branch 'test'
6 years ago
2ce560b39f
生产报工明细实体修改和枚举新增
6 years ago
470d319504
Merge branch 'dev' into test
6 years ago
3cc4aec00a
库存预警看板
6 years ago
2f1a3080ba
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
05c56e46b4
库存预警看板开发
6 years ago
176f9ffd5f
Merge branch 'test'
6 years ago
713503d7ff
Merge branch 'dev' into test
6 years ago
5d1447c92a
1. 解决标准拣货多级存储区查找的问题
6 years ago
41324abdad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
854ee5b3cf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
6 years ago
0f3d67d110
供应商收货看板功能完成
6 years ago
8347085f26
冲突
6 years ago
e3d5e5bb19
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
6 years ago
eb2f61c32f
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
4309454d2a
邮件异常提示优化
...
EXCEL数据通用导出
6 years ago
f32f7e72a2
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
f3151cbbe3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e13d4163b7
库存交易报表代码提交
6 years ago
a4016dc911
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
34dcf6d526
枚举修改
6 years ago
33ec897657
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
734340fe63
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
7b83985f40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f6bf244b12
流程管家放MOVENO的BUG
6 years ago
6259bd56bc
通用EXCEl导出MODEL
6 years ago
320910e2ae
Merge remote-tracking branch 'origin/dev' into test
6 years ago
dfef27151d
冲突
6 years ago
f834e91353
Task#764+枚举TRUE_OR_FALSE
6 years ago
32cc1db3bf
Merge remote-tracking branch 'origin/dev' into test
6 years ago
62b2ea298b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
6 years ago
ea83820fbf
新增物料类型跟单位类型
6 years ago
b3272dc3d7
冲突
6 years ago
fe13a43ccc
WmsEnumUtil冲突（几步法）
6 years ago
ea4cde868f
Merge remote-tracking branch 'origin/dev' into test
6 years ago
fb98db0bcc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c08a569ac5
sql优化
...
数据权限实体增加字段
枚举增加数据权限的交易对象
6 years ago
7d0cd674cf
零星退料指令导入开发
6 years ago
79d1da3230
系统数据初始化
6 years ago
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
16bb8d6714
Merge remote-tracking branch 'origin/dev' into test
6 years ago
8e41b40196
excel工具类优化
6 years ago
884d4fd763
Merge remote-tracking branch 'origin/dev' into test
6 years ago
21746dc440
excel工具类优化
6 years ago
163cb6240e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
31c347275c
添加重要度枚举
6 years ago
ac8b9d3986
Merge remote-tracking branch 'origin/dev' into test
6 years ago
b7a7eb29ae
安灯类型 查 表 已从表改为枚举
...
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
6 years ago
68fadff818
Merge remote-tracking branch 'origin/dev' into test
6 years ago
2adff745fb
自定义表单 功能优化
6 years ago
0fb7e05e88
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
10c276fb16
自定义数据源
6 years ago
511df468ec
Merge remote-tracking branch 'origin/dev' into test
6 years ago
13af329513
动态查询Cloud 服务基础功能已完成 1.0
6 years ago
a58888df85
Merge remote-tracking branch 'origin/dev' into test
6 years ago
c4dceace92
增加动态报表对外接口-批量修改
6 years ago
878108e86f
Merge remote-tracking branch 'origin/dev' into test
6 years ago
f2b19055d4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3630f0c2f1
动态查询Cloud 服务基础功能已完成
6 years ago
0e70ff103a
Merge remote-tracking branch 'origin/dev' into test
6 years ago
94166da1ec
条码状态修改
6 years ago
c07858d5ba
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a5caf4eab5
供应商退货枚举新增
6 years ago
727c1efea8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
507902473c
新增业务类型枚举
6 years ago
b0faa179d1
报废状态从条码状态移入到质量状态中
6 years ago
1a7cda72d3
Merge remote-tracking branch 'origin/dev' into test
6 years ago
27e4fc8ec2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
28ae6cf85d
Merge remote-tracking branch 'origin/dev' into test
6 years ago
aec4b9a85a
自定义表单 多数据源 功能完成
6 years ago
a39ce52aa9
呼叫升级和响应升级优化
6 years ago
e2cfcc4c5f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
8ea762e5df
细节优化
6 years ago
e514479f00
细节优化
6 years ago
67e3851a86
Merge branch 'dev' into test
6 years ago
10cc2ac052
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d081c16c61
安灯类型，状态，子类型，基础数据开发
6 years ago
4cbc41a959
细节优化
6 years ago
3cba9077fe
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f1e8f07a90
新增需求：自处理
6 years ago
7ef2eb0c6e
报表 表单打通
6 years ago
f6d70a2781
Merge branch 'dev' into test
6 years ago
1adcd23c6f
呼叫升级和响应升级优化
6 years ago
47baf16e0f
ANDON动作
6 years ago
d70f85d592
Merge branch 'dev' into test
6 years ago
9c5aab7215
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c9243ccad0
呼叫升级和响应升级优化
6 years ago
e33c7c2465
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8e7b3d61e7
枚举修改
6 years ago
27b32626b3
开发主动升级和启动产线业务
6 years ago
701430066e
事务管理
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
ba3064d27d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3a7aace277
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
5ba134126a
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1efd33975d
生产队列，生产计划，生产工单优化和bug修复
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
8a298687c2
开发andon呼叫停止产线
6 years ago
9eb6e82306
开发andon呼叫停止产线
6 years ago
fef940bcda
Merge remote-tracking branch 'origin/dev' into test
6 years ago
c8a9edab64
质量判定业务修改
6 years ago
d714733a27
Merge branch 'dev' into test
6 years ago
曾贞一
4e45f813dc
CS_ORDER_STATUS 枚举修改
...
DdlPreparedPack getNotInPack getNotInPackString 方法修改
6 years ago
9200080178
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
6 years ago
e24e7ef421
Merge branch 'dev' into test
6 years ago
a42bb71aee
docker配置文件修改
6 years ago
440083b5f2
Merge branch 'dev' into test
6 years ago
65b5ac3803
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cc02090910
事务调整及demo
6 years ago
630ad20587
开发安灯呼叫升级定时任务
6 years ago
21d3c053ca
Merge remote-tracking branch 'origin/dev' into test
6 years ago
b5696a63f7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e79987d235
MES流程配置接口（流程，产品流程配置）
6 years ago
a7833ea9dd
Merge remote-tracking branch 'origin/dev' into test
6 years ago
b90139312c
条码管控枚举添加
6 years ago
2eb732c7df
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
6 years ago
7c647c7844
1、班次pojo修改
...
2、andon项目新增组织模型基础数据
6 years ago
c1bf54f9c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5a3e2996c7
findMaxByProperties更新
6 years ago
7c20f070e4
Merge remote-tracking branch 'origin/dev' into test
6 years ago
8c443c3afb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
d6221c39ae
生产模块bug修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
72ac3490e4
ANDON枚举
6 years ago
5f5b3b84bd
Merge branch 'dev' into test
6 years ago
4a84e1e8ca
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
95789ab615
ANDON实体枚举更新
6 years ago
12e555e3a4
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c7e5fc732e
mes组织模型菜单等级枚举修改
6 years ago
56e17f62e9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
593a062e9f
ANDON枚举
6 years ago
494fc4aa70
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
486dda639f
pcn队列pojo vin字段改为string型
6 years ago
8ccc265f0d
ANDON枚举更新
6 years ago
c9c470a27f
开发物理安灯业务
6 years ago
47bd2c0aa7
安灯项目开发
6 years ago
298a3c1ddf
Merge remote-tracking branch 'origin/dev' into test
6 years ago
4cf5fbc2b7
#4091+流程配置复制流程+作业步骤参数，作业组件，作业组件参数，作业流程基础数据接口代码调整
6 years ago
6ebc22e6cc
master分支配置调整
6 years ago
58247fe3f1
清除iml
6 years ago
4e9a8ab787
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f343ea865c
安灯和硬件适配初始化
6 years ago
0a36f9130f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
b2c5494983
联调系统配置接口
6 years ago
8e2bf96a14
找回丢失代码
6 years ago
12e2f1d1b8
Merge remote-tracking branch 'origin/dev' into test
6 years ago
85a44b1baa
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
19f30ce4f9
流程配置+定时处理错误移动单给错误信息赋值过长
6 years ago
0c7b87bf24
Merge remote-tracking branch 'origin/dev' into test
6 years ago
d6c7e39989
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
038484e7ac
工步调度业务完善
6 years ago
099a58a14d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
7e8730ea9f
自定义按钮功能接口
...
消息优化
6 years ago
f8b89c930b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a1a63c2247
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
feace14920
PCN同步MES主数据
6 years ago
850b372ab4
Merge remote-tracking branch 'origin/dev' into test
6 years ago
cb628b0125
事务持久化调整
6 years ago
ed474fe112
Merge remote-tracking branch 'origin/dev' into test
6 years ago
b3f4ccbb78
自定义脚本开发
6 years ago
c8c8dc6750
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
b76ccb43d2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7da6627878
sweb通知公告
6 years ago
82de566e90
封装字符串>= <=查询
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
4a5d0f0cb3
Merge remote-tracking branch 'origin/dev' into test
6 years ago
cdd0e5fc05
消息接口修改
6 years ago
3d56e2539d
合并dev代码
6 years ago
950c6dee36
附件来源
6 years ago
eee0539562
sweb公告处理
6 years ago
0cde3d8a63
Merge remote-tracking branch 'origin/dev' into test
6 years ago
89d6ef61f4
盘点加
6 years ago
fb4be4580d
Merge remote-tracking branch 'origin/dev' into test
6 years ago
186a9ccb0d
监控台
6 years ago
83ce4f0efb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a62ead1c25
Mes生产计划，生产工单
6 years ago
ef109e185d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c119c06130
自定义表单 使用Redis 1.0 功能完成
6 years ago
df63afecf8
Merge remote-tracking branch 'origin/dev' into test
6 years ago
8a69224e05
优化入库和质检明细处理业务
6 years ago
311eaf979a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
e5e0c05b9f
Mes生产计划开发
6 years ago
28e43c087b
合并dev分支代码
6 years ago
97e992f05f
自定义表单拦截器开发1.1完成
...
优化动态表单页面接口
6 years ago
cd1c135594
交易处理组件isPart!=isSnControl（新增枚举取反方法）+库位新增默认状态为“空库位”
6 years ago
50f0a7d52a
新增逻辑修改
6 years ago
1a583f7ebb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ce55dda367
确认订单目录调整
6 years ago
6cb456fcc4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
b2efdd2496
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
ab1e524f20
MES生产计划枚举
6 years ago
1896472e63
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
01a5cb287b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e20d212991
IS_GENERAL_TASK加上Code+DATA_STATUSCode值改为TRUE和FALSE
6 years ago
0181b0ecab
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
9418373b4d
DdlPack，封装bug
6 years ago
8678d9961e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e161894239
Mes生产计划枚举类
6 years ago
65b388d048
合并dev分支代码
6 years ago
af8f8884a2
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
120ea87da8
动态接口集成 Bug修复
6 years ago
f509514233
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4d9b1efb69
MES 生产计划枚举
6 years ago
ac52608e22
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a464028a3b
新增初始化
6 years ago
9c54bc6f9d
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6960275e3b
DdlPack，日期封装bug
6 years ago
64350cce31
DdlPack，日期封装bug
6 years ago
df714efc3b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
887121580b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8e5a26bc63
修改是否指定条码枚举
6 years ago
15901e3fe1
自定义表单拦截器开发1.0完成
6 years ago
d885d6b877
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
63d0178cfd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
93f4d1cfd7
发布列表接口
6 years ago
19b78c4148
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bec70bc79d
DdlPack，数字equals添加大于0的约束
6 years ago
a7450b71fc
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3980e05d2b
mes新增通用功能可配置的业务-完善
6 years ago
d0cac648f3
添加update通过DdlPack
6 years ago
b80cda2439
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
0f637fe2f7
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
58ec3e9323
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a745015be7
移库单指定条码枚举
6 years ago
542052815b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9dca4f2dbb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
eda257bf23
盘点PDA端，输入数量校验
6 years ago
18c6a72b3e
订单类型枚举
6 years ago
bb2d5f905a
ids改为idsStr
6 years ago
4b440fc1f3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5a4c85e409
消息附件管理
6 years ago
4c0116b082
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6d8643da0c
权限分配调整接口
...
消息调整添加微服务支持
添加sweb通知处理队列
6 years ago
1d9dd174e9
前端联调接口优化
...
单号生成工具类bug解决
6 years ago
7f10c22613
部分细节调整
6 years ago
d70eec3967
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9802d19b2e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f1993e69c8
sweb目录调整
6 years ago
82d472466b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cc3b1a741c
元素虚拟属性封装
6 years ago
3a5f43f97b
删除iml文件
6 years ago
f810e35873
自定义表单 数据操作接口 DAO 层优化
6 years ago
c90dca9b05
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2df3b92103
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9d047fa3e5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1adc8e4baf
自定义表单 数据操作接口 DAO 层完成
6 years ago
a22492193e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
152bcdf9ce
优化质检明细枚举
6 years ago
7e0f4b031f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
cb1b5f9fdb
bug修复
6 years ago
5b0d4f8d37
元素增删改查 DAO层接口完成
6 years ago
712ec2af7e
单据状态描述
6 years ago
1371f94838
熔断返回信息封装
6 years ago
e82f1fe49c
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
87aa6644fd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
76cbc39fe1
新增自动填充null值属性
6 years ago
be9edbce54
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6f7258d49b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
edee3a7312
优化枚举
6 years ago
fdb9e655c3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6971fdbf60
删除json序列化not_empty限制
6 years ago
3c5d6cadf9
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
f0b666b502
优化
6 years ago
9c7665d354
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2830bd0376
hql封装优化
6 years ago
e61669dd98
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
fb78a04969
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
863b7b0d61
移动单条码的行号不做为查询条件
...
交易处理组件：出入移库：移动单明细可能没有关联单据，所以只能根据源库位类型和质量状态更新库存相应数量
6 years ago
426b2e8952
质检枚举修改
6 years ago
7876ab6475
hql封装优化
6 years ago
6755e5ade3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4ba121d7c9
架构修改基础方法
6 years ago
36034d4925
查询优化
6 years ago
261c9bea38
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a7370f4cc0
调用获取单号
6 years ago
92c5457521
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2b91b9a1d8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
59b086dc5d
BaseBean.findByHqlWhere:查询别名代码错误
...
WmsHqlPack:修改封装方法使用DdlHqlPack
任务合并代码错误
6 years ago
d59318a024
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ccce8c009c
级联功能接口完成
6 years ago
b9d013280f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
87895eb194
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
709c018fb4
Sweb更新到订单明细修改历史记录查询
6 years ago
cb6b06cb6a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
97e0889971
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4f0e3756df
优化调整
6 years ago
faa8a0d1c7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
865add1f7f
按钮功能接口
6 years ago
ee1488d28e
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6b8ac6240d
LINK_ORDER_TYPE无需数值
6 years ago
e8deda24fe
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ecdd1d45de
是否散件枚举添加
6 years ago
fe644066af
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
244494d77b
hql封装优化
6 years ago
04ed151d45
元素管理接口完成(未测试)
6 years ago
38311760a1
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
cd00bdd954
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
3c2a345b93
盘点pc端
6 years ago
93f4745afd
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
...
# Conflicts:
# pom.xml
6 years ago
7190c8ff6f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
045c68ee2e
数据对象管理接口开发完成
6 years ago
3d8b3983c3
优化枚举
6 years ago
ff4c50c5f1
枚举统一
6 years ago
0ed4691114
枚举统一
6 years ago
8b3b37260e
枚举统一
6 years ago
e8de83b696
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
afa2ac746a
定时获取库存移动信息开发
6 years ago
dbeb965e9b
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
e4adb35413
自定义表单 数据对象 新增接口完成
6 years ago
e4a3b95f16
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1049a11576
自定义表单 数据对象 新增接口完成
6 years ago
c500681b5d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
00ee87f645
新增NC处理的操作类型枚举
6 years ago
f039095f83
数据对象实体更新
...
创建数据对象 Model
6 years ago
a8f3307237
定时任务循环记录异常
6 years ago
2d6e3b5545
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
635cc27eb0
自定义表单布局接口
...
自定义表单菜单接口
自定义表单功能接口
6 years ago
111c6177c9
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
1897d227e6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ea2eb6103d
优化调整
6 years ago
dd0af51d8f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4aaa9bc03a
1.优化流程管家
...
2.开发条码打印，订单打印，收货回执打印
6 years ago
bfd99830b6
FindBugs 提示Bug 修改
6 years ago
6396056d08
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3ec56056d3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1dcdf36537
添加mes、mes-pcn、sweb三个微服
6 years ago
01ee15e67a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
569e872ebc
自定义表单枚举添加
6 years ago
b9d00d181e
条码枚举
6 years ago
b1f195a185
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
557f21bf6a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
bd6f6c0546
交易处理组件V2.0：库存交易表中数量类属性与库存表保持一致
6 years ago
73d2da12ed
po版本枚举
6 years ago
2e020d7be2
修改枚举类
6 years ago
dcfb0f5cdf
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
738db8d837
条码打印开发，角色微服务提供
6 years ago
f52b3ff189
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8da671628c
盘点PC
6 years ago
e1519f832f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
148d808129
枚举添加数据状态字段
6 years ago
618ce5d560
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c4ef1e66f3
开发条码打印后端
6 years ago
8ec8dba414
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7e9704db00
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fd6552b4ac
定时任务封装
6 years ago
9ee4956924
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2b848e18e0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
a495ea2fce
更新质检枚举
6 years ago
6464cbd533
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d62910737b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5951d7fad8
schedule定时任务调整，fallback熔断机制改为factory模式
6 years ago
20cea81ea2
初始化状态为新建 枚举新增
6 years ago
a4301ce4b2
redis.pusHashMap
6 years ago
48161d95a1
枚举冲突
6 years ago
e7fa2f3abf
NC,盘点交易处理组件
6 years ago
249ca7f372
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
114816d483
删除多余枚举类
6 years ago
1c7d601922
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
c4a9a4ac1e
解决id重复问题
6 years ago
62196df6bf
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
aa1b4ac805
定时获取库存移动信息开发
6 years ago
142e2b47c9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
74b63d8a72
开发流程管家根据任务创建流程
6 years ago
550f15cb35
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
207b7ea7eb
解决id重复问题及shiro授权bug
6 years ago
11a2a72917
枚举类加入禁用、启用、全部
6 years ago
41a1cc46e8
枚举条码状态调整
6 years ago
de5760bba1
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c0841bb89c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
24b38fefb0
入库添加枚举类
6 years ago
85d3463348
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
e1825eac40
交易处理组件ALL
6 years ago
d604b42c1d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
e4600e1c01
定时获取库存移动信息开发
6 years ago
ab63dadb1c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8ac4046a7d
开发校验权限和获取个人任务列表公用方法
6 years ago
0a5c19ebe5
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
d2190c55c7
解决冲突
6 years ago
8edf27d389
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9a6a9018cf
更新枚举
6 years ago
6835593401
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
03fe15e2f4
自定义报表优化
6 years ago
cc4484a562
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
201f960d08
冲突
6 years ago
31d91f48b3
收货交易处理组件开发
6 years ago
398a3d98c5
更新POJO
6 years ago
ed7857b86d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b667d6840e
获取权限和根据权限获取任务列表
6 years ago
89bd80ea21
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
d41a4f0dc9
提交NC枚举
6 years ago
8967fd21e6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
576743ed18
自定义表单，动态对象工具
6 years ago
1e18495617
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1bdc307a1b
自定义报表 折线图功能完成
6 years ago
62987c7d0f
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
f25395ebd6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
ce9cbe1198
更新pojo
6 years ago
296db97c72
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6c6710dd67
在途库位 枚举修改
6 years ago
54bc2fe482
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8822f4f22f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
5b6b720d7d
优化报表
...
单号生成规则调整重置条件
6 years ago
4b4fb30248
自定义报表 饼图功能完成
6 years ago
44148da43c
comit
6 years ago
0361d6bd79
业务类型统一存数字类型；关联单据类型统一存字符串类型
6 years ago
86a70e758b
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
44676161ad
自定义模板优化
...
echarts 工具新增
6 years ago
6b419e11cb
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
6 years ago
ba90dfb123
开发交易处理主程序
6 years ago
933654a86a
增加库位状态枚举
6 years ago
d67d4fa929
SQLPACK冲突
6 years ago
1aa8f7fd1a
任务处理程序
6 years ago
8e029e82e0
报表优化
...
解决bug
邮件消息优化
6 years ago
78ffcb9550
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
73181f1c1a
WMS实体对象重构，枚举修改
6 years ago
adfe3cb2e6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ba36cfecd5
报表优化
...
国际化接口
6 years ago
dedc7b45fe
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
b01e479cb3
报表优化
...
impp压测接口优化
消息队列非空验证
单号管理增加状态
6 years ago
3fce943723
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a3e1381736
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4c83a05d0f
自定义报表 获取目录接口功能完成
6 years ago
ebb4cc9f2e
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
bb0eda58f4
流程管家调整
6 years ago
02f95f0939
性能测试
6 years ago
a68771db32
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
23450c0218
bug解决
...
操作日志添加人员登录名称
6 years ago
db8a4fbe6f
日志白名单
6 years ago
b28cab255d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
295d4c9ac9
报表布局 行高,列宽设置
...
MongoDB id 映射处理
6 years ago
16daf7c1b9
修改了
6 years ago
a2bbd4b5f0
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c61d0882c5
模板管理生成HTML 完成
6 years ago
42f00211c1
模板确认接口完成
...
模板状态扭转功能完成
6 years ago
19a8189b05
模板管理 后台功能完成
6 years ago
2bd16137bd
模板管理 后台功能完成
6 years ago
e35113c519
报表排版实体变更
6 years ago
1e43b2e36f
模板Pojo 调整
6 years ago
dd9c35e6e1
模板Pojo 调整
...
模板 枚举 添加
添加枚举接口
6 years ago
c5f3897bc9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ccd5613b3
目录联调Bug 修复
...
模板Pojo 创建
模板枚举定义
6 years ago
cfbd536004
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cb30fc88b2
添加了线程池和消息队列的交换机机制
6 years ago
504c3e871c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
42a38392fc
报表元素接口
6 years ago
cb59664740
新增获取目录类型接口
...
新增查询关联角色接口
枚举名称调整
6 years ago
69d385d6d5
报表元素
6 years ago
d7aa0bda87
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
989ad48653
主键生成策略调整，日志部分调整
6 years ago
7d4f3ebb67
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
77296816e6
通用导出
...
单号规则导入导出
系统参数添加组
6 years ago
0263ad0a90
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
6 years ago
c4b0e3ba0e
解决bug
...
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
6 years ago
79ad222295
用户密码加密侧率功能完成
6 years ago
c45091584c
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
b8a1196a45
添加自定义组件
6 years ago
dd11ff1e71
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
effa749d3f
#
6 years ago
ff4812ae04
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2498c50bfd
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
47ebc8795a
getSingleResult优化
6 years ago
65fead254f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
436f8ca139
解决bug
6 years ago
180c8c230c
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
02e31b07c8
定时任务日志完成
...
解决bug
6 years ago
8a8f3dbb57
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
b3d7cb259e
组织管理父节点Bug 修复
...
复杂查询添加默认排序
6 years ago
e01d83adca
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
609c1557d3
bug解决
6 years ago
3f6b281912
发版 2018年12月28日
6 years ago
d30a3685d1
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4f828e8fab
定时任务重写
6 years ago
2dedd836f5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
46335b8a81
redis会话优化
6 years ago
b8d4a3a08a
流程管家优化
6 years ago
a4d59caaeb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
b55906ced0
生产领料优化
6 years ago
a5e05ef36e
修改流程管家在调组件之前对组件参数的过滤条件：组件参数类型为30的不用验证，组件名为prompt的不用验证
6 years ago
ea621d14f8
定时任务修改
6 years ago
cc3bb9e9ae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6b06d3ff04
bug解决
...
添加默认字典项
ics添加全局异常捕获
6 years ago
f456ff2f75
入库上架扫描条码
6 years ago
38be37aad0
Merge branch 'dev' into test
6 years ago
f2d7279e94
计算bug修改
6 years ago
a9ab449316
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
159892b64d
修改
6 years ago
e329c69aa5
公用计算方法修改
6 years ago
7b2d7f78dd
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
79ee50684e
Merge remote-tracking branch 'origin/dev' into dev
7 years ago
0988c1ad26
用户登录优化
7 years ago
126d829b41
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
62f601d287
Merge remote-tracking branch 'origin/dev' into dev
7 years ago
8cb5c2ee1a
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
5ee989b9a5
bug解决
7 years ago
25bf0de397
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
fc2a6c515c
计算方法名调整为find
7 years ago
3a86ae3980
新增通用计算方法
7 years ago
a2695771e0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
fe67546768
开发质检组件 扫描箱条码 扫描箱条码回显 处理箱条码
7 years ago
6118568fd5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
91a4386978
调整software序号
7 years ago
6821bb17cc
枚举名称统一
7 years ago
ffb29d0d03
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
c221d618ea
登录日志功能完成
7 years ago
bb289774d9
dashboard部分功能
...
修复bug
7 years ago
4a89439b30
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
f775968194
扩展块功能
7 years ago
faf1c1318f
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
0429edfb61
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
b58b06f1a3
作业流程明细动作类型添加
7 years ago
47105866be
合并代码 解决冲突
7 years ago
c6399fb209
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
4fe87c5ce2
解决bug
7 years ago
786c652900
冲突解决 合并代码
7 years ago
95a58d97a2
冲突解决 合并代码
7 years ago
bd3ab06440
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
7 years ago
35ecf85881
冲突解决 合并代码
7 years ago
47dd4c68b5
配置文件修改 Test to dev
7 years ago
d9214fd746
动态表单 基础功能完成
7 years ago
2ad41030e6
合并代码 并打开 MQ 以及邮箱
7 years ago
9eb7122e99
发布 正式版本 1.0
7 years ago
cb95d0a713
项目pom版本更新为test
7 years ago
4bda89ee5b
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
950303231f
提交代码
7 years ago
a7a39d7016
优化代码
7 years ago
06d801be01
优化代码
7 years ago
838f500156
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
7 years ago
d7b4b1f7ab
transient 替换为 @Transien
7 years ago
6683c2bdc1
Merge remote-tracking branch 'origin/master'
7 years ago
5398a45033
Sonar Test
7 years ago
e45e68824f
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
800c77cf1d
解决冲突
7 years ago
af863ec5a1
更改质检枚举信息
7 years ago
e92db6fd26
Merge remote-tracking branch 'origin/master'
7 years ago
203bfcb231
double非空判断
7 years ago
3b61edb7ab
解决冲突
7 years ago
11278ac43a
解决冲突
7 years ago
85e31cdc02
Merge remote-tracking branch 'origin/master'
7 years ago
de979cfac6
登录功能优化
7 years ago
d5bbf84965
hql日期封装
7 years ago
d039586e05
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
ad67318f27
添加常量
...
工具类代码优化
账号状态注释部分代码
7 years ago
beafe050ba
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
c92d9e98e4
枚举修改
7 years ago
256c2acd41
条码类型枚举添加
7 years ago
7a8baf42d7
冲突
7 years ago
cd777e00a5
流程管家create
7 years ago
7b8a6aafaf
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
76af709841
增加枚举
7 years ago
b0aca765ed
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
9dd0392bc0
解决冲突
7 years ago
7e48019386
微服调用调整
7 years ago
2779046bf8
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
52d4a995d4
spring gateway添加
...
细节调整
7 years ago
d2a3f4a9bf
返回实体代码字段添加
7 years ago
4d8148ea9d
返回实体构造添加
7 years ago
8bc9984e4e
组件中PO条码表中状态枚举
7 years ago
bb9f6b28ce
Merge remote-tracking branch 'origin/master'
7 years ago
804008410e
功能代码优化
7 years ago
43ed6deb6c
解决冲突
7 years ago
442ec7cb5f
解决冲突
7 years ago
e67151271b
组件中单据类型枚举新增
7 years ago
c9dd7ba3cb
参数类型枚举添加
7 years ago
91e9252ed5
枚举添加
7 years ago
d2d4171e14
枚举添加
7 years ago
69c2961bdc
冲突
7 years ago
c1e1a87333
一次性加载枚举
7 years ago
ae7c00576a
作业参数添加枚举状态
7 years ago
9ad28091fa
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
df478b5ff5
枚举添加
7 years ago
7154172d3b
test
7 years ago
5dbf1bb2e8
自动填充信息Bug 修复
7 years ago
4229601ddb
消息管理封装
7 years ago
48f47956a2
基础对象调整
7 years ago
24df1f406a
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
ffcd496e4e
微服优化，pom调整
7 years ago
855d9abef8
1、复杂树 功能完成
7 years ago
9cda18eb32
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
e5567ce4eb
修改代码
7 years ago
690d9ef408
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
b3faaf50f4
库存交易前后端以及(11月19日)所有的小bug
7 years ago
4aa58b943d
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
0e5a97f783
微服优化，pom调整
7 years ago
470dbb015e
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
ef85c84e68
1、BaseRepositoryImpl 根据ID 查询Bug 修复
...
2、更新字段名,更新对象名称
7 years ago
80962cf2b3
初始化服务注册中心icloud center service
7 years ago
86809c2027
Merge remote-tracking branch 'origin/master'
7 years ago
9867152278
微服调整
7 years ago
145182f2da
更改模块
7 years ago
9b529bf438
更改模块
7 years ago
ccdfc19aff
库存移动单状态枚举添加
7 years ago
b2d19f7cbf
合并sql
7 years ago
64ea8f7fab
开发盘点主表、盘点冻结表、盘点实盘表
7 years ago
21a79af65a
合并
7 years ago
b02c8f4674
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
...
# Conflicts:
# modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
# modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
7 years ago
12392de1a4
库存，库存条码，库存交易信息，库存交易条码V1
7 years ago
0634674c83
解决冲突
7 years ago
c87c038410
meiju
7 years ago
fe92584fa8
开窗
7 years ago
3fdeb69eee
dragon
7 years ago
dec260e3ca
代码优化
7 years ago
4303d11fa5
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
1b76c95b7a
站内信 全部完成
7 years ago
6f524abe28
枚举
7 years ago
eb8795e1a6
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
d5b71f274f
单元测试开发工具类新增
7 years ago
fe5538386a
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
...
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
7 years ago
be354e6dd3
增加枚举
7 years ago
4ebe75e66c
新建枚举
7 years ago
c82ba74e9e
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
88429e342e
枚举修改
7 years ago
3a34cfbd6b
eureka、feign整合
7 years ago
f07489d04d
eureka、feign整合
7 years ago
4fb5f548cf
定时任务 完成
...
表达式 完成
邮件工具类
7 years ago
d49a2661cf
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
f677400273
单元测试开发工具类新增
7 years ago
6a9ecc9543
Merge remote-tracking branch 'origin/master'
7 years ago
b77fc7f291
微服调整
7 years ago
2e8e2895c7
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
67a45fa7ac
Merge remote-tracking branch 'origin/master'
7 years ago
f8579cdfc6
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
...
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
语言管理 完成
资源管理 完成
7 years ago
98d60b8443
用户信息拆分 合并代码处理
7 years ago
6991ab1599
用户信息拆分
7 years ago
477f6c5ff1
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
22d5ba1c0f
字段修改
7 years ago
b9db3d0076
开发po订单主表、明细表
7 years ago
6fc6519382
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
92d74bee7b
开发po订单主表
7 years ago
ec877f57c7
Merge remote-tracking branch 'origin/master'
7 years ago
58d4c25ccc
1，弱删除bug
7 years ago
ae61fad0d5
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
e2124a843e
Merge remote-tracking branch 'origin/master'
7 years ago
f7ceb96bad
1，弱删除方法调整
...
2，初始化弱删除
7 years ago
1263460ced
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
...
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
7 years ago
d0c6ec627c
查询条件添加
7 years ago
2abfc97d8e
Merge remote-tracking branch 'origin/master'
7 years ago
b2ad639060
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
7 years ago
6079c8e1a7
开发po订单主表
7 years ago
0868238a6d
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
...
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java
7 years ago
03ddda82d1
系统日志 全部完成
...
操作日志 全部完成
系统语言 全部完成
7 years ago
dad173dfd0
1，对象hashcode和equals继承父对象
...
2，主键生成策略优化
7 years ago
6dcb783c21
是否已刪除标识
7 years ago
cb34dad394
1，添加判断方法
...
2，切面中，补全新增和修改的用户基础信息
7 years ago
947471e553
Merge remote-tracking branch 'origin/master'
7 years ago
f8e8217389
代码调整优化
7 years ago
f170fb4dbb
Merge remote-tracking branch 'origin/master'
7 years ago
55932fd0b8
mongodb 输出简单json
...
重复id
7 years ago
0e589a8bb2
代码调整
7 years ago
ab06c1e165
代码优化
7 years ago
6ffcdc3c33
日志分析工具持久化，baserepository优化
7 years ago
4e343b504b
Merge remote-tracking branch 'origin/master'
7 years ago
wei.peng
汪云昊
jimmy.zeng
陈思洁
WYnneaoapc
刘敏
crish
曾贞一
王杰
许心洁
于学杰
peter.pan
jenkins
jenkins
sky.meng
shiyanghuan
alwaysfrin
wei.peng
Silliter
allen.zhang
柯裕
jiajack
yiming.gu
yihang.lv
jimmy
Jack.lv