Dominic_Xiao
|
eacbdbaa7d
|
20027--MES看板-班组数来源班组信息，需要班组信息中增加一个字段来维护班组人数-2021-04-02
|
4 years ago |
 钮海涛
|
543433bfff
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
9ee464f67e
|
新增报工功能
|
4 years ago |
joke.wang
|
bddd4b37a2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
52b2ea43da
|
14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值
|
4 years ago |
陈思洁
|
2b2761ade2
|
【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】
|
4 years ago |
|
joke.wang
|
ca8bfd3f53
|
泰国扭矩采集
|
4 years ago |
wynne1005
|
64c2ed920f
|
修改通用界面端口 还原第三方数据库连接字符串中的时区
|
4 years ago |
|
wynne1005
|
0ba5c62931
|
Merge branch 'screen' into dev
|
4 years ago |
|
wynne1005
|
714a32a994
|
first commit
|
4 years ago |
|
Dominic_Xiao
|
f12c568119
|
天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值
|
4 years ago |
|
Dominic_Xiao
|
cc86a60ba7
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
9eba8f1683
|
天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段
|
4 years ago |
|
joke.wang
|
072bc431fb
|
扭矩采集
|
4 years ago |
shun
|
1fbccdcf40
|
查询移库单增加供应商名称
|
4 years ago |
simon.song
|
3c6a7b410d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
5554bfd14c
|
14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17
|
4 years ago |
puxiao.liao
|
2adc935bb0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mes-pcn/pom.xml
sonar-project.properties
|
4 years ago |
|
钮海涛
|
23f6f9285b
|
增加4车间补满模逻辑
|
4 years ago |
许心洁
|
4f919011dc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
github33
|
9a4aae9f68
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
github33
|
a61f2c1778
|
CYCLE_RULE--新增枚举
|
4 years ago |
 王杰
|
f3b0998315
|
Merge pull request '状态机优化' (#265) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/265
|
4 years ago |
|
王杰
|
38d03b1060
|
状态机优化
|
4 years ago |
|
wynne1005
|
7767630fbb
|
tmp
|
4 years ago |
|
wynne1005
|
15633bc28e
|
tmp
|
4 years ago |
|
陈思洁
|
9e0d03629c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
281957a6f5
|
【3324 泰国-扭矩采集 --PC端后端】
|
4 years ago |
|
joke.wang
|
3d0d39ac1d
|
Tha扭矩采集
|
4 years ago |
|
陈思洁
|
ccf221f80b
|
【pojo改名字】
|
4 years ago |
|
陈思洁
|
39ced0a83d
|
【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】
|
4 years ago |
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
4 years ago |
|
汪云昊
|
1eae64bafe
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
95052a4e78
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
汪云昊
|
46e068ccdb
|
feat(softswitch):REST按状态码重试
|
4 years ago |
|
joke.wang
|
7f8dd50412
|
物料关系表
|
4 years ago |
|
wynne1005
|
a44a4a8be3
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
d97a855e83
|
移除screen
|
4 years ago |
|
Dominic_Xiao
|
9fc68bc443
|
14382 19081-安灯广播速度调整未生效-20210312:修改播放速度类型为浮点型
|
4 years ago |
|
汪云昊
|
4272aad4ac
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
汪云昊
|
d45d5175dc
|
feat(softswitch):REST按状态码重试
|
4 years ago |
|
wynne1005
|
44f61e1525
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
385156cd18
|
refactor(core): SSO 支持方式变更
|
4 years ago |
|
Dominic_Xiao
|
e58ffc9d69
|
天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段
|
4 years ago |
|
汪云昊
|
fc28ea2346
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
钮海涛
|
ffa0aa94f8
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
caafb9c317
|
修改排程计划逻辑
|
4 years ago |
|
汪云昊
|
2443d1d8e6
|
feat(softswitch):REST按状态码重试
|
4 years ago |
|
Dominic_Xiao
|
ce91ea879f
|
天津-PCN新增功能:物料校验客户标签
|
4 years ago |
|
许心洁
|
f363979f24
|
任务#3328
|
4 years ago |