汪云昊
|
0b3d2d6815
|
软适配REST 适配器调整优化
|
5 years ago |
 钮海涛
|
f87eeeb491
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
917a101f20
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
df2e8601c4
|
task:1719
|
5 years ago |
puxiao.liao
|
ba81a26700
|
1778 产品工装关系维护
|
5 years ago |
joke.wang
|
f6e2a509f0
|
[任务：1751工厂小时OEE]
|
5 years ago |
陈思洁
|
543f0f5c4c
|
【代码合并还原】
|
5 years ago |
|
joke.wang
|
b450df5754
|
[任务：1752工厂oee]
|
5 years ago |
|
joke.wang
|
142f8e79c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
f41cd22258
|
[bug: 8353 拍照采集]
|
5 years ago |
wynne1005
|
63bc0b5928
|
merge test
|
5 years ago |
|
wynne1005
|
46a91a13bc
|
jis 去除rule关键字
|
5 years ago |
|
wynne1005
|
25b2fb8e21
|
jis pojo 去除rule 关键字
|
5 years ago |
|
陈思洁
|
28de0251ea
|
【sonar bug修改】
|
5 years ago |
 曾贞一
|
1901cf6eb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
2dac15c248
|
【1709 BH-录入检测值】
|
5 years ago |
|
puxiao.liao
|
1983602b3a
|
8060 AP-MGN-BJ-19081 --扫描查询输入零件号查询，查询出来的零件数量全部为0
|
5 years ago |
|
钮海涛
|
bbe03cc6fd
|
解决合并冲突问题
|
5 years ago |
|
钮海涛
|
1b88b20e13
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
40a87d83b3
|
修复合并问题
|
5 years ago |
 贾文涛
|
4c8f3c34a2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
6760ed79dd
|
数据权限-修改启用禁用问题
|
5 years ago |
|
钮海涛
|
05276bcf46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
|
钮海涛
|
d74d78353d
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
5 years ago |
 王杰
|
1dff3327d7
|
任务：1733 条码模板逻辑调整
|
5 years ago |
|
joke.wang
|
363ac22ade
|
[任务：1750 OEE运算JOB]
|
5 years ago |
|
wynne1005
|
1cda7e902b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
宋军超
|
345b261118
|
设备添加枚举EQU_DEFECT_CAUSE故障原因,EQU_DEFECT_METHOD故障处理措施,EQU_DEFECT_PHENOMENON故障现象;
|
5 years ago |
|
宋军超
|
f9dfc8e0e2
|
plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举)
|
5 years ago |
|
wynne1005
|
27e4fb164b
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
724e784fe3
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
c5d4cd7dad
|
生产计划编制
|
5 years ago |
|
钮海涛
|
2b85a05645
|
新增脚本WebSocket
|
5 years ago |
|
wynne1005
|
d925ec62bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
888d87f12e
|
task edi
|
5 years ago |
|
joke.wang
|
f38a47cc68
|
[oee 定时任务]
|
5 years ago |
|
钮海涛
|
dd70688754
|
新增脚本WebSocket
|
5 years ago |
qianhs
|
dd3249fc12
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
qianhs
|
fdaa4c1740
|
bug:8268;8267;8266;8265
|
5 years ago |
|
贾文涛
|
a563537750
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
e63601716f
|
1736-MES数据权限模块开发
|
5 years ago |
|
宋军超
|
e5e41f09e7
|
新增散件产品配置功能
|
5 years ago |
|
qianhs
|
f03e119561
|
bug:8268;8267;8266;8265
|
5 years ago |
|
钮海涛
|
6e2344b303
|
bug:8330
|
5 years ago |
|
汪云昊
|
627257fc22
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
32460a3272
|
sqlserver 适配处理，in 参数类型不准确
|
5 years ago |
|
陈思洁
|
ae156ad82f
|
【动态按钮--完成按钮修改mes和mespcn】
|
5 years ago |
|
钮海涛
|
8f884a58cf
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
90edd435e3
|
bug:8293;8297
|
5 years ago |
|
joke.wang
|
3227cfa47e
|
[oee]
|
5 years ago |
|
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
5 years ago |
|
陈思洁
|
32f6215be7
|
【8309 产品配方导入-导入报错】
|
5 years ago |
|
王杰
|
de200de372
|
mes
|
5 years ago |
|
曾贞一
|
0a51c0e10c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
97d7fdbf24
|
【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】
|
5 years ago |
|
钮海涛
|
a575b4eed4
|
bug:8287;8288;8290
|
5 years ago |
|
王杰
|
da1c10dc4c
|
mes生产计划批量编制
|
5 years ago |
|
曾贞一
|
fb15536a34
|
【8254 中航-出库单-客户发运-新增销售订单字段】
|
5 years ago |
|
曾贞一
|
e6f8811f72
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
cf12f354ae
|
[8206 生产工单-导入失败]
|
5 years ago |
|
钮海涛
|
7aaed8fb79
|
task:1735
|
5 years ago |
|
joke.wang
|
de7d007ef1
|
[获取工步sql server分组函数问题修复]
|
5 years ago |
|
钮海涛
|
ac9ffb1ac1
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
陈思洁
|
ad8255949a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
be925fded9
|
【1693-设备状态监控看板】
|
5 years ago |
袁津哲
|
000c2ad16c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
745455c5bd
|
修改波次规则bug和对接导入模板接口
|
5 years ago |
|
钮海涛
|
bf2cc9843f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
puxiao.liao
|
b9af2c52f8
|
1713 BH-挑选，返修
|
5 years ago |
|
钮海涛
|
81f380aec4
|
产品入库表新增
|
5 years ago |
|
joke.wang
|
60428b5bad
|
[任务：1690 界面窗口]
|
5 years ago |
|
钮海涛
|
b7dceccd71
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
f414274aeb
|
供货追踪
|
5 years ago |
|
陈思洁
|
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 |