袁津哲
|
1caea6bf36
|
修改实体数字字段
|
5 years ago |
|
袁津哲
|
d289a58439
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
db7d86acc1
|
修改实体数字字段默认值0，不允许为空
|
5 years ago |
wynne1005
|
035e77c0ab
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
5d6588b5af
|
task `1565` 增加发运字段
|
5 years ago |
陈思洁
|
03d2ee9246
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
244270684d
|
【泰国项目】
|
5 years ago |
|
袁津哲
|
a5a8130388
|
修改不兼容sqlserver数据库查询语句
|
5 years ago |
|
wynne1005
|
86713a01f2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
joke.wang
|
4469d92344
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
f1baf4fdbe
|
[麦格纳问题：111 检测项报表]
|
5 years ago |
宋军超
|
8109275630
|
添加散件BOM导入
|
5 years ago |
|
宋军超
|
69b620336f
|
散件BOM导入
|
5 years ago |
|
wynne1005
|
15c9e7111b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 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
|
5 years ago |
|
qianhs
|
20f5bfc9eb
|
wms数据同步迁移至mes
|
5 years ago |
|
陈思洁
|
72563a4eb5
|
【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】
|
5 years ago |
 王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
5 years ago |
|
陈思洁
|
59cbfbf293
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
08ec98305b
|
【1581 工位扫描-记录换模时间 -校验逻辑调整】
|
5 years ago |
|
joke.wang
|
3e33a7ac3a
|
[客户jit增加JIT排序号字段]
|
5 years ago |
|
王杰
|
ed61052742
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
b1018dbd39
|
[平台；]
|
5 years ago |
|
袁津哲
|
1a74363541
|
优化实体字段
|
5 years ago |
puxiao.liao
|
4b3923a64d
|
bug8056【8056 car_no,driver_no这两个字段没有写在事务表中，导致wms_move_to_erp中没有】
|
5 years ago |
|
wynne1005
|
b5ecb91399
|
中航四月十号 内容提交
|
5 years ago |
|
joke.wang
|
4e8c4ae46f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
caf8feb374
|
[采集工步存入生产数据格式修改]
|
5 years ago |
|
joke.wang
|
11adb5ff09
|
[麦格纳问题：111 检测项数据报表]
|
5 years ago |
 钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
01ae9caa8c
|
task:1496
|
5 years ago |
alwaysfrin
|
f4e9a80d79
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
alwaysfrin
|
14660641ba
|
hibernate优化
|
5 years ago |
wei.peng
|
fa42a25b96
|
异常处理优化
|
5 years ago |
|
puxiao.liao
|
63c827d0de
|
bug8050【8050 运输规则配置页面--新增成功，数据库有数据，但是页面不显示】
|
5 years ago |
|
joke.wang
|
1d50c135ac
|
[麦格纳问题：87 增加工单管理页面]
|
5 years ago |
 曾贞一
|
3bea17f2d7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
b7e3aeef41
|
【8014 20011--报工记录表，查询数据重复---0415】
【8015 20011--报工记录报表，增加两列显示】
|
5 years ago |
|
钮海涛
|
4dee474c73
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
302529199b
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
cd810ce1fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
5a6c525d1f
|
【MES_生成条码模型增加时分秒字段】
|
5 years ago |
|
王杰
|
08e5e4a349
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
e0a23b147e
|
mes enum
|
5 years ago |
|
王杰
|
2b790d91ea
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
5 years ago |
|
qianhs
|
2e85d99380
|
联调测试
|
5 years ago |