puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
|
puxiao.liao
|
eb8f03cf19
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
|
4 years ago |
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
 钮海涛
|
7c60ce4cdc
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
b5bbf7aefb
|
增加等待时间评估规则
|
4 years ago |
|
puxiao.liao
|
48d2f6680a
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-screen/pom.xml
|
4 years ago |
|
李俊生
|
85dd71b1ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-screen/pom.xml
|
4 years ago |
wynne1005
|
83b4cb64df
|
merge dev
|
4 years ago |
|
钮海涛
|
f50d358cdd
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
wynne1005
|
b46bd3b354
|
feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
|
4 years ago |
andly.pan
|
43d7195a37
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
钮海涛
|
4088a85a5c
|
更改左边界计算逻辑：后道工序满模即可开始。
|
4 years ago |
joke.wang
|
49f709959d
|
15711 19081-邮件提醒内容每一条之间增加换行和序号
|
4 years ago |
|
钮海涛
|
3dd67766b2
|
测试时间
|
4 years ago |
|
joke.wang
|
eef6f8e18b
|
节假日 泰国
|
4 years ago |
|
钮海涛
|
e918d85702
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
30048f4ce1
|
修改枚举
|
4 years ago |
|
wynne1005
|
1323569c56
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
0c860de567
|
feat(SCREEN): 数据对象操作 1
数据对象操作 1
|
4 years ago |
 王杰
|
844349d583
|
冲突
|
4 years ago |
|
王杰
|
21a3d716f4
|
pom
|
4 years ago |
|
王杰
|
5bf5504992
|
pom
|
4 years ago |
|
puxiao.liao
|
f429c08f30
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
钮海涛
|
ae88dda60d
|
新增MDM对象转换工具。
|
4 years ago |
|
puxiao.liao
|
3af79ea582
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
a9881bc01f
|
修复泰国产品条码统计
|
4 years ago |
|
钮海涛
|
508fd77881
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
4f697d51ec
|
演示问题修复
|
4 years ago |
|
钮海涛
|
63a8aef96d
|
演示问题修复
|
4 years ago |
汪云昊
|
ec605315bb
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
|
汪云昊
|
862256e751
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
|
汪云昊
|
9241c60f07
|
feat(mdm):通用导入导出及外部应用扩展
|
4 years ago |
|
钮海涛
|
736087852e
|
新增成品检验报工
|
4 years ago |
|
钮海涛
|
33be7da477
|
新增成品检验报工
|
4 years ago |
|
wynne1005
|
9c4b233975
|
refactor(core): 支持用户密码过期
Finish 21.4.8
|
4 years ago |
陈思洁
|
6ffd586274
|
【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】
|
4 years ago |
|
wynne1005
|
5b003a613b
|
screen修改关系表名 增加历史表
|
4 years ago |
|
wynne1005
|
64c2ed920f
|
修改通用界面端口 还原第三方数据库连接字符串中的时区
|
4 years ago |
|
wynne1005
|
714a32a994
|
first commit
|
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 |
|
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 |
|
王杰
|
38d03b1060
|
状态机优化
|
4 years ago |
|
wynne1005
|
15633bc28e
|
tmp
|
4 years ago |
|
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
4 years ago |
|
wynne1005
|
a44a4a8be3
|
Merge branch 'dev' into test
|
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 |