陈思洁
|
22b42d710b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
ff6e5ac926
|
【8239 生产作业-单产品扫描（数据写入有误）】
|
6 years ago |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
a8ae48b132
|
【7937 半成品箱条码绑定工步-数据写入缺少】
|
6 years ago |
|
汪云昊
|
30c0b2e46a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
d4a91b6d69
|
缺失资源接口优化
|
6 years ago |
许心洁
|
1a7d9edd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
3cd2fb02f4
|
宁德BUG-JIS发运汇总JOB:BUG#8246
|
6 years ago |
|
汪云昊
|
241ea78cda
|
检测环境枚举数据调整
|
6 years ago |
|
汪云昊
|
71d30c3232
|
表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展
表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化
|
6 years ago |
 王杰
|
3660418497
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
2b01efb15b
|
mes生产计划批量编制
|
6 years ago |
wynne1005
|
d5f69eeefd
|
task 1565 发运修改
|
6 years ago |
 曾贞一
|
d29a26c73f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
8e529f46d7
|
【1722 BH-Bacth条码查询】
|
6 years ago |
宋军超
|
92c13e5bcd
|
添加人员技能功能
|
6 years ago |
袁津哲
|
64daf36410
|
动态搜索修改人修改时间开窗处理,BUG:8097
|
6 years ago |
|
袁津哲
|
633aef2d6e
|
动态搜索修改人修改时间开窗处理
|
6 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
6 years ago |
|
wei.peng
|
fe94ad9bf3
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
8aab106aa9
|
合并代码 pom 冲突
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
|
6 years ago |
|
wei.peng
|
279ec2d1fe
|
授权加密问题修复
|
6 years ago |
|
宋军超
|
b96eb1b669
|
添加人员技能功能
|
6 years ago |
|
陈思洁
|
2c50fceec9
|
【1693-设备状态监控看板】
|
6 years ago |
|
陈思洁
|
87664b96cb
|
【合并冲突】
|
6 years ago |
|
陈思洁
|
abd974f54f
|
【1693-设备状态监控看板】
|
6 years ago |
 钮海涛
|
724ba402bf
|
前端联调
|
6 years ago |
|
曾贞一
|
bc82c85790
|
【1721 BH-BH检测结果管理】
|
6 years ago |
|
袁津哲
|
5ba022c21a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
b23915236b
|
开发根据实体动态生成数据库文档页面功能
|
6 years ago |
|
钮海涛
|
60580e5ad9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
cb8688105c
|
task:1727;1728;1729
|
6 years ago |
|
王杰
|
e9afe5a943
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
cace95fbed
|
ptl
|
6 years ago |
|
钮海涛
|
3fbf532c84
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
2cc43af431
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
6 years ago |
joke.wang
|
ce1dd45842
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke.wang
|
755fccb45e
|
[任务：1690 产能监控看板]
|
6 years ago |
|
曾贞一
|
c3b6376934
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
f3e53ff1eb
|
【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
|
6 years ago |
|
钮海涛
|
7b2a4fdea7
|
合并dev代码
|
6 years ago |
|
钮海涛
|
475bb9370f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
qianhs
|
2303186fc4
|
【657】【中航WMS看板－成品发运率看板】
【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】
|
6 years ago |
|
joke.wang
|
ee1c2131ff
|
[任务：1716 写入产品下线记录]
|
6 years ago |
|
钮海涛
|
398207b875
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
曾贞一
|
6190a4f66d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
156f0feedc
|
【1603 委外扣减查询】
|
6 years ago |