 曾贞一
|
e5c275499c
|
【冲突解决】
|
6 years ago |
|
曾贞一
|
255aefbcef
|
【1585 销售订单管理-销售订单维护】
|
6 years ago |
 钮海涛
|
e64134a821
|
修复合并问题
|
6 years ago |
|
钮海涛
|
e9ec4cecfe
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
00fce0bded
|
新增客户物料发往地
|
6 years ago |
wynne1005
|
0e934f9af6
|
task `1565` 发运enum
|
6 years ago |
|
wynne1005
|
81f05c233a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
93622f5dc7
|
中航 开线管控 提交
|
6 years ago |
汪云昊
|
f09159dffa
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
34c77d6944
|
ICS 注册中心监控接口，Actuator对外端口调整
|
6 years ago |
puxiao.liao
|
a2f7c3426e
|
bug7994【7994 麦格纳收货需求差异】
|
6 years ago |
|
钮海涛
|
01d3eeea51
|
新增客户物料发往地
|
6 years ago |
|
钮海涛
|
16f6861ecd
|
新增窗口时间
|
6 years ago |
宋军超
|
aac4e24113
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
b02d7372f6
|
添加散件bom批量导入功能
|
6 years ago |
joke.wang
|
9e0fbef169
|
[按钮组件代码优化]
|
6 years ago |
|
钮海涛
|
dd9ae231c8
|
与界面联调物料扩展属性
|
6 years ago |
|
wynne1005
|
48f94c0369
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
cc739eac24
|
task `1565` 发运pojo
|
6 years ago |
|
钮海涛
|
331fb73d28
|
新增供应商维护基础数据
|
6 years ago |
|
joke.wang
|
99e055da3c
|
[现场问题：111 检测项报表]
|
6 years ago |
袁津哲
|
30610476b9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
1caea6bf36
|
修改实体数字字段
|
6 years ago |
qianhs
|
214fbb8da2
|
【1613 装车单新增中航打印格式】
|
6 years ago |
|
钮海涛
|
080aa0b3e3
|
修改sonar pom 版本号为dev
|
6 years ago |
|
袁津哲
|
d289a58439
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
袁津哲
|
db7d86acc1
|
修改实体数字字段默认值0，不允许为空
|
6 years ago |
|
wynne1005
|
035e77c0ab
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
5d6588b5af
|
task `1565` 增加发运字段
|
6 years ago |
陈思洁
|
03d2ee9246
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
244270684d
|
【泰国项目】
|
6 years ago |
|
袁津哲
|
a5a8130388
|
修改不兼容sqlserver数据库查询语句
|
6 years ago |
|
wynne1005
|
86713a01f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
1051b22575
|
ICS 注册中心监控对象
|
6 years ago |
|
joke.wang
|
4469d92344
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke.wang
|
f1baf4fdbe
|
[麦格纳问题：111 检测项报表]
|
6 years ago |
|
宋军超
|
8109275630
|
添加散件BOM导入
|
6 years ago |
|
宋军超
|
69b620336f
|
散件BOM导入
|
6 years ago |
|
wynne1005
|
15c9e7111b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
qianhs
|
ca85c59cdb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
6 years ago |
|
qianhs
|
20f5bfc9eb
|
wms数据同步迁移至mes
|
6 years ago |
|
陈思洁
|
72563a4eb5
|
【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】
|
6 years ago |
 王杰
|
c6aefc89e7
|
test合并dev解决ct
|
6 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
6 years ago |
|
陈思洁
|
59cbfbf293
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
08ec98305b
|
【1581 工位扫描-记录换模时间 -校验逻辑调整】
|
6 years ago |
|
joke.wang
|
3e33a7ac3a
|
[客户jit增加JIT排序号字段]
|
6 years ago |
|
王杰
|
ed61052742
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
b1018dbd39
|
[平台；]
|
6 years ago |
|
袁津哲
|
1a74363541
|
优化实体字段
|
6 years ago |