汪云昊
|
dd0de76d4d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
qianhs
|
457e10bc75
|
1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】
|
6 years ago |
gaochangjiang
|
d0165fd342
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
陈思洁
|
2414993cf9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
777060450e
|
新增字段--目标库位
|
6 years ago |
|
gaochangjiang
|
047b9d5e35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gaochangjiang
|
02e3ac4960
|
【库存预警】bug 修复库存预警
|
6 years ago |
|
汪云昊
|
25425822a8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
154bba4b3b
|
LAC 调度模式优化
|
6 years ago |
WYnneaoapc
|
7f9f9cb242
|
返工返修pojo字段更改 1092
|
6 years ago |
|
WYnneaoapc
|
9ad66157a8
|
数据同步优化 1078-4
|
6 years ago |
 钮海涛
|
2c47556abf
|
1：新增工作计划资源位置插入逻辑
|
6 years ago |
jokelone
|
93438e1bdb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
21087d5d4d
|
【需求：1092 工序BOM和物料绑定记录模板增加构造方法】
|
6 years ago |
|
钮海涛
|
921be6b0f2
|
1：新增工作计划资源位置插入逻辑
|
6 years ago |
|
汪云昊
|
ba7c713b6f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
cfd7f5276e
|
实体调整
|
6 years ago |
crish
|
6996dc2273
|
6204: MesConfig配置添加业务主键
|
6 years ago |
|
WYnneaoapc
|
4ceef3c6d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
于学杰
|
6087fe0c2c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
80c340308a
|
1. 修改通用接口POJO中的字段长度
|
6 years ago |
|
WYnneaoapc
|
35f625ac21
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
563955570d
|
数据同步优化 1078
|
6 years ago |
|
汪云昊
|
e0ec7bb377
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
50bf9300ba
|
LAC 调度模式完成
|
6 years ago |
|
jokelone
|
828cf66784
|
【需求：1090 工序BOM，物料绑定记录删除多余字段】
|
6 years ago |
 王杰
|
cb319e4304
|
【需求：1126，设备周期计划】
|
6 years ago |
lpx
|
00954f2917
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
lpx
|
69be002972
|
【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】
|
6 years ago |
|
jokelone
|
4dcbcf068a
|
【需求：1090 产品类型图片增加字段】
|
6 years ago |
|
汪云昊
|
86a18d730a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
4b66ec0e87
|
任务实例id
|
6 years ago |
|
汪云昊
|
9907813aed
|
Lac调度实体
|
6 years ago |
|
jokelone
|
7ee96d1444
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
6fd7e6be5f
|
【需求：1092 维修类型】
|
6 years ago |
许心洁
|
bbec6a1002
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7799937093
|
成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除
|
6 years ago |
|
许心洁
|
b112bdb5e8
|
成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除
|
6 years ago |
|
王杰
|
75ce77f6f1
|
【需求：1126，设备周期计划】
|
6 years ago |
|
钮海涛
|
6a1990a215
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
钮海涛
|
2e02d77966
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
王杰
|
347c47c82f
|
【需求：1125，设备报表】
|
6 years ago |
|
jokelone
|
438517be44
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
6 years ago |
|
jokelone
|
6c847cf305
|
【需求：1091 返厂返修添加字段和枚举】
|
6 years ago |
|
王杰
|
2069d6a3ae
|
【需求：1125，设备报表】
|
6 years ago |
wei.peng
|
f67a61ec92
|
网关 添加 APS 路由
BASE URL 路径优化
|
6 years ago |
|
wei.peng
|
aeff042046
|
添加 组织代码查询
|
6 years ago |
 曾贞一
|
ed9e388c8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
1357dfad30
|
【VDA收货-- 前端PC端POsn页】任务号1102
【VDA收货-- 问题清单中加密库位】任务号1104
【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112
【VDA收货-- 对于分组数据如何查看分组信息】任务号1111
|
6 years ago |
|
WYnneaoapc
|
b668879f9d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
2f382d37cc
|
【需求：1124，首检件配置】
|
6 years ago |
|
jokelone
|
0011a4bc56
|
【需求：1089 过程检测数据 增加字段】
|
6 years ago |
|
王杰
|
dcaf007f4d
|
【需求：1107，生产工单首检件】
|
6 years ago |
|
WYnneaoapc
|
29ac92566d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
b05711dc6c
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
jiajack
|
3c8b920a4c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
95789b1bd8
|
增加生产质量情况BI业务
|
6 years ago |
|
钮海涛
|
794bbc4fba
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
jokelone
|
bc13a8a3ac
|
【需求：1090 返厂返修增加分页查询】
|
6 years ago |
|
钮海涛
|
5b712ce774
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
许心洁
|
dd86ce354a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b8842edbb1
|
无条码打印：新功能开发完成
|
6 years ago |
|
WYnneaoapc
|
dbd4a7578b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
88af19f8e9
|
修改开发环境pom文件test为dev
|
6 years ago |
|
changjiang.gao
|
376ca4bbd4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
3f6f6428f6
|
【需求:1106,设备通知，优化】
|
6 years ago |
|
changjiang.gao
|
13066bd4d1
|
【库存预警】bug 243
|
6 years ago |
|
WYnneaoapc
|
04c99167c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
6de6d36e80
|
数据库抽取反写 1105-1
|
6 years ago |
|
jokelone
|
a5609d97fb
|
【1092 返厂返修增加枚举】
|
6 years ago |
|
钮海涛
|
d99ad6c44a
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
王杰
|
03a4c98234
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
803d5c57f2
|
【需求1101，设备维修作业，第3次提交】
|
6 years ago |
|
wei.peng
|
699276777a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
7496eb4a1b
|
LAC 全部 CRUD 接口完成
|
6 years ago |
|
钮海涛
|
5183163abd
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
WYnneaoapc
|
e6e2e9fb22
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
67461457fc
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
1e0f0c706c
|
安灯问题修复
|
6 years ago |
|
crish
|
f093a97cf0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
4eaa8b5b17
|
导入导出
|
6 years ago |
|
crish
|
6902c79472
|
问题清单问题修复
|
6 years ago |
|
crish
|
7d8b8664cc
|
问题清单问题修复
|
6 years ago |
|
WYnneaoapc
|
848f6b2f23
|
工位监控优化 1050-6
|
6 years ago |
|
WYnneaoapc
|
c71d667d0f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
56996126be
|
【需求：1101，mes同步设备安灯维修任务】
|
6 years ago |
|
jokelone
|
d7f55250ef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
8d10a46953
|
(1092 MesProdBindRecordModel增加有参构造方法)
|
6 years ago |
|
changjiang.gao
|
30007cee47
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9bdae2ad13
|
【需求：1086，设备点检保养作业】
|
6 years ago |
|
WYnneaoapc
|
c56822dc40
|
工位监控优化 1050-5
|
6 years ago |
|
WYnneaoapc
|
3dbbee3c60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
f6b06e6b52
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
aef7f7a948
|
增加班次顺序字段
|
6 years ago |
|
jiajack
|
d87d81e34a
|
【产线运行情况】-BI报表开发
|
6 years ago |
|
许心洁
|
73aef5326c
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
d0b98f0869
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
00e849a62e
|
(1089 过程质量检测基础数据；1090 返厂返修基础数据)
|
6 years ago |
|
许心洁
|
3bc277178e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
f7fbd1c24f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |