陈思洁
|
22b42d710b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ff6e5ac926
|
【8239 生产作业-单产品扫描（数据写入有误）】
|
5 years ago |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
陈思洁
|
a8ae48b132
|
【7937 半成品箱条码绑定工步-数据写入缺少】
|
5 years ago |
|
汪云昊
|
30c0b2e46a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
d4a91b6d69
|
缺失资源接口优化
|
5 years ago |
许心洁
|
1a7d9edd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
3cd2fb02f4
|
宁德BUG-JIS发运汇总JOB:BUG#8246
|
5 years ago |
|
汪云昊
|
241ea78cda
|
检测环境枚举数据调整
|
5 years ago |
|
汪云昊
|
71d30c3232
|
表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展
表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化
|
5 years ago |
 王杰
|
2b01efb15b
|
mes生产计划批量编制
|
5 years ago |
wynne1005
|
d5f69eeefd
|
task 1565 发运修改
|
5 years ago |
 曾贞一
|
d29a26c73f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
8e529f46d7
|
【1722 BH-Bacth条码查询】
|
5 years ago |
宋军超
|
92c13e5bcd
|
添加人员技能功能
|
5 years ago |
袁津哲
|
64daf36410
|
动态搜索修改人修改时间开窗处理,BUG:8097
|
5 years ago |
|
袁津哲
|
633aef2d6e
|
动态搜索修改人修改时间开窗处理
|
5 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
5 years ago |
|
wei.peng
|
fe94ad9bf3
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 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
|
5 years ago |
|
wei.peng
|
279ec2d1fe
|
授权加密问题修复
|
5 years ago |
|
宋军超
|
b96eb1b669
|
添加人员技能功能
|
5 years ago |
|
陈思洁
|
2c50fceec9
|
【1693-设备状态监控看板】
|
5 years ago |
|
陈思洁
|
87664b96cb
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
abd974f54f
|
【1693-设备状态监控看板】
|
5 years ago |
 钮海涛
|
724ba402bf
|
前端联调
|
5 years ago |
|
曾贞一
|
bc82c85790
|
【1721 BH-BH检测结果管理】
|
5 years ago |
|
袁津哲
|
5ba022c21a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
b23915236b
|
开发根据实体动态生成数据库文档页面功能
|
5 years ago |
|
钮海涛
|
60580e5ad9
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
cb8688105c
|
task:1727;1728;1729
|
5 years ago |
|
王杰
|
cace95fbed
|
ptl
|
5 years ago |
|
钮海涛
|
3fbf532c84
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2cc43af431
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
joke.wang
|
ce1dd45842
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
755fccb45e
|
[任务：1690 产能监控看板]
|
5 years ago |
|
曾贞一
|
c3b6376934
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
f3e53ff1eb
|
【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
|
5 years ago |
|
钮海涛
|
7b2a4fdea7
|
合并dev代码
|
5 years ago |
|
钮海涛
|
475bb9370f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
qianhs
|
2303186fc4
|
【657】【中航WMS看板－成品发运率看板】
【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】
|
5 years ago |
|
joke.wang
|
ee1c2131ff
|
[任务：1716 写入产品下线记录]
|
5 years ago |
|
钮海涛
|
398207b875
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
曾贞一
|
6190a4f66d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
156f0feedc
|
【1603 委外扣减查询】
|
5 years ago |
|
joke.wang
|
aa9ee803b8
|
[任务：1683-看板管理 展示]
|
5 years ago |
puxiao.liao
|
7c7691f583
|
bug8190【8190 中航-成品条码维护-批量修改客户代码-】
|
5 years ago |
|
钮海涛
|
4d383dda1b
|
新增事务报工查询
|
5 years ago |
|
joke.wang
|
795312637c
|
[任务：1683-看板管理 计划产能]
|
5 years ago |
|
puxiao.liao
|
0a973c5dd1
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
f6988f36c8
|
1655 生产领料单增加替代料
|
5 years ago |
|
wei.peng
|
3aa1afb0ce
|
对象历史记录 Pojo 创建
|
5 years ago |
|
wei.peng
|
c8197f3290
|
1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
|
5 years ago |
|
wei.peng
|
9d3a4db040
|
日志查询Bug 修复
|
5 years ago |
|
wei.peng
|
fee90baf64
|
1. 关闭register , gateway , console 日志持久化技术
2. Sonar Bug 修复
3. 自定义日志持久化
|
5 years ago |
|
joke.wang
|
e6f3dd5c32
|
[任务：1683-看板管理]
|
5 years ago |
|
袁津哲
|
7789883f9b
|
开发导入功能模块
|
5 years ago |
|
曾贞一
|
509240126a
|
【1604 待入库数据查询】
|
5 years ago |
|
钮海涛
|
a597d78100
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
c57ca73a4a
|
bug:8169;8176;8177
|
5 years ago |
|
王杰
|
9da9a568f5
|
mes
|
5 years ago |
|
wei.peng
|
effae233bf
|
对象历史记录 Pojo 创建
|
5 years ago |
|
wei.peng
|
fe46d8da29
|
1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
|
5 years ago |
|
wei.peng
|
69346da06d
|
日志查询Bug 修复
|
5 years ago |
|
wei.peng
|
dac1358009
|
1. 关闭register , gateway , console 日志持久化技术
2. Sonar Bug 修复
3. 自定义日志持久化
|
5 years ago |
|
曾贞一
|
312cf59f49
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
88ce1e59cf
|
【1604 待入库数据查询】
|
5 years ago |
|
joke.wang
|
4e02acb9e3
|
[任务：1683-看板管理]
|
5 years ago |
|
袁津哲
|
7696925c9f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
8a6c9aadef
|
开发导入功能模块
|
5 years ago |
|
wynne1005
|
fb60d75eea
|
还原test pom
|
5 years ago |
|
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
109c4429ce
|
还原dev pom
|
5 years ago |
|
qianhs
|
0a2d9a3d6d
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
joke.wang
|
fa8e4c1b55
|
[任务：1683 看板管理]
|
5 years ago |
|
wynne1005
|
64f3dcf276
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
cfb5aab8ea
|
新增工步集合 repository
|
5 years ago |
|
qianhs
|
62883c5cc0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
puxiao.liao
|
e417e761c7
|
bug8124【8124 物料拆分-输入数量-系统异常】
|
5 years ago |
|
joke.wang
|
43bc24340c
|
[料架条码打印优化]
|
5 years ago |
|
袁津哲
|
9518628c12
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
533d8e55e8
|
开发导入模块功能
|
5 years ago |
|
钮海涛
|
1a5f3e7325
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
eb85cc232f
|
task:1623
|
5 years ago |
|
王杰
|
2bb2b2c828
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
d4bde19861
|
mes
|
5 years ago |
|
wynne1005
|
430adb8d97
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
1c4050b71f
|
工步返回内容修改
|
5 years ago |
|
王杰
|
74a4a1381c
|
mes
|
5 years ago |
|
joke.wang
|
4c637b4e83
|
[写入JIT发运接口表]
|
5 years ago |
|
joke.wang
|
48ee207a8a
|
[删除多余项]
|
5 years ago |
|
joke.wang
|
d22bd22012
|
[任务：客户JIT自动下达]
|
5 years ago |
|
汪云昊
|
ccf2f42840
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
edf0b66115
|
Sonar代码缺陷修复
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
|
5 years ago |
|
袁津哲
|
df480bf11d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
36b4e67020
|
导入模板功能建模
|
5 years ago |
|
宋军超
|
8fe5574c67
|
part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE")
|
5 years ago |