陆卫豪
|
62800f757e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
WYnneaoapc
|
185b40a586
|
6518 管控代码修改
|
6 years ago |
 钮海涛
|
bed955575d
|
修复规则组合关联问题
|
6 years ago |
jokelone
|
ce63c161be
|
【任务：1211报表功能开发：生产报表】
|
6 years ago |
jenkins
|
04ae04246e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
549f63aa0d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
07bda76d4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
b181cf2ac3
|
【安全库存拉动】
|
6 years ago |
|
许心洁
|
77b921ef38
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b0c4d11000
|
流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304）
|
6 years ago |
|
jenkins
|
edc281dffe
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
qinjia zou
|
51d70654ef
|
【欧洲-生产快速入库】bug6389
|
6 years ago |
 王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
王杰
|
71d39f54d2
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
c595d3f6b1
|
修改字段
|
6 years ago |
|
陆卫豪
|
d6ff7aa2b1
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
wei.peng
|
492367670b
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
59d6eb0727
|
添加系统配置接口
|
6 years ago |
|
王杰
|
5943854c5b
|
增加字段
|
6 years ago |
|
jokelone
|
054502b657
|
【任务：1193接口调试】
|
6 years ago |
|
钮海涛
|
695ab094d2
|
修复资源表多选枚举显示问题。
|
6 years ago |
|
钮海涛
|
89943f6586
|
修复资源表多选枚举显示问题。
|
6 years ago |
|
qinjia zou
|
7a134dc0cb
|
【欧洲-生产快速入库】bug6389
|
6 years ago |
|
jenkins
|
8eb8c2f97e
|
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
7b47c7b942
|
修复关联对象字段显示问题
|
6 years ago |
|
王杰
|
9f9c095846
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
4441d1dc86
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
WYnneaoapc
|
88d480403c
|
数据库字段初始化属性 赋值longtext
|
6 years ago |
crish
|
92c1e846b6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
汪云昊
|
c4ed0f1f37
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
12ba5d2ff3
|
lac微服务模式优化
|
6 years ago |
1111
|
e0a5b36061
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
许心洁
|
b88a879c58
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
jenkins
|
603004c190
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
1720952d23
|
修复自定义字段表达式取值问题
|
6 years ago |
|
crish
|
3645541765
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
d35c6e97cd
|
【采购收货】
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
9baac06cb7
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e91369c82a
|
【需求：1198】
|
6 years ago |
|
陆卫豪
|
0fad1e4df5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
23b3ae88e5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
0e9b9b26fd
|
包装打印逻辑修改
|
6 years ago |
|
jenkins
|
e7bad502c3
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
96ea008725
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
c0d8375d0f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
1111
|
41a48b4b59
|
【采购收货】 采购收货
|
6 years ago |
|
许心洁
|
8d6a2b53b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b7c6189308
|
生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）
|
6 years ago |
|
jenkins
|
4be5d5e1aa
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |