puxiao.liao
|
46085f9051
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
 钮海涛
|
81bbe8476a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
6e6b0a7c11
|
排程结果优化
|
4 years ago |
|
puxiao.liao
|
b31342c5db
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Xiao-yin0517
|
e7f5397e59
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
Xiao-yin0517
|
b9bae06c0c
|
更改实体字段，添加实体
|
4 years ago |
|
puxiao.liao
|
2580841944
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
808f60a64a
|
代码优化
|
4 years ago |
|
puxiao.liao
|
0d73e0797e
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
ba00df95f2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
d71434851c
|
增加库位名称
|
4 years ago |
潘天虎
|
5d05083665
|
Merge pull request 'ext-dev' (#276) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/276
|
4 years ago |
|
andly.pan
|
8b9883d2f7
|
增加邮件和字段属性
|
4 years ago |
wynne1005
|
4f74fdaa3d
|
密码过期策略加入安全策略
|
4 years ago |
|
puxiao.liao
|
e0083530f0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
96ea96f0a2
|
模板明细增加是否导出模板excel 头
|
4 years ago |
|
puxiao.liao
|
c42a4b250d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
andly.pan
|
a0b6222236
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
Xiao-yin0517
|
a47b8d1785
|
syncDataId改为string类型
|
4 years ago |
joke.wang
|
5eae801feb
|
16073 19081-看板管理-产量看板-产量看板调整
|
4 years ago |
 曾贞一
|
00a12b8a1c
|
【15902 19125+ASN业务收货条码，收货完成后。在打印中心-条码打印状态标记为已打印+0519】
|
4 years ago |
|
andly.pan
|
7b13c17236
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
849e13b3ff
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
d06f8e9bed
|
Merge branch 'ext-dev' of http://git.estsh.com/andly.pan/i3plus-pojo into pext-dev
|
4 years ago |
|
Xiao-yin0517
|
d74e2f053d
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
|
4 years ago |
|
潘天虎
|
1cc6fcaa9a
|
Merge pull request 'ext-dev' (#275) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/275
|
4 years ago |
|
andly.pan
|
44bbc798c1
|
Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev
|
4 years ago |
|
andly.pan
|
dfa897720e
|
Mdm增加repo
|
4 years ago |
|
andly.pan
|
e66c99e509
|
Mdm修改
|
4 years ago |
|
puxiao.liao
|
52bb4fe82f
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Xiao-yin0517
|
0f406c54b8
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
|
4 years ago |
|
Xiao-yin0517
|
c4b82c4891
|
更改通过同步数据
|
4 years ago |
|
潘天虎
|
8366905f58
|
Merge pull request 'ext-dev' (#274) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/274
|
4 years ago |
|
andly.pan
|
8abe9cb030
|
新增动态配置
|
4 years ago |
|
钮海涛
|
c4660251cd
|
优化资源评估中间计算结果。
|
4 years ago |
|
andly.pan
|
19767dfcc9
|
Merge branch 'ext-dev' of http://git.estsh.com/andly.pan/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
f2cca59ee5
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
46debfb7fb
|
Mdm增加字段
|
4 years ago |
|
andly.pan
|
4890eb87a3
|
Mdm增加字段配置
|
4 years ago |
simon.song
|
aa3d3ff674
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
dd7657d7e1
|
数据迁移功能优化
|
4 years ago |
|
钮海涛
|
3d66e54cea
|
优化资源评估中间计算结果。
|
4 years ago |
陈思洁
|
3fa05bc816
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
1f84c2f8aa
|
【15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22】
|
4 years ago |
|
钮海涛
|
463f910b7a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
3a3bdc664a
|
修复工作左边界计算问题
|
4 years ago |
|
simon.song
|
e4c94df17c
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
83e33e2403
|
代码还原
|
4 years ago |
|
Xiao-yin0517
|
2d2faaaa4c
|
更改实体类
|
4 years ago |
|
andly.pan
|
3dca058857
|
Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev
|
4 years ago |