汪云昊
|
6293bf352d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
luweihao
|
e90ea98d1f
|
解决冲突
|
5 years ago |
|
luweihao
|
03f1c4fddf
|
修改生产数据结构
|
5 years ago |
|
汪云昊
|
081db93d0d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
 王杰
|
05077f1750
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
8881bafecf
|
ptl pcn
|
5 years ago |
joke lin
|
3b928c6ddc
|
[bug: 7637 生产数据]
|
5 years ago |
|
汪云昊
|
b0a4eccca4
|
禁用启用，软删
|
5 years ago |
|
joke lin
|
e8f48bcb04
|
[bug: 7637 生产数据查询]
|
5 years ago |
|
王杰
|
ddcb46e8e0
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
0b8c3317b8
|
ptlpcn enum
|
5 years ago |
zcg
|
3d28840bae
|
【新增枚举，pojo】
|
5 years ago |
|
zcg
|
b28c092ade
|
【新增枚举】
|
5 years ago |
宋军超
|
8b9d8fd16d
|
添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体
|
5 years ago |
|
luweihao
|
8148b1654f
|
补上mes枚举
|
5 years ago |
|
陆卫豪
|
a65350bbf8
|
Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
5 years ago |
|
zcg
|
416c2ceffc
|
【任务 1443 excel模板导入功能修改】
|
5 years ago |
|
zcg
|
9388e3b4f2
|
【pojo 冲突提交】
|
5 years ago |
|
luweihao
|
679319635a
|
task `1430` 工位扫描，产品信号监听，队列监听
|
5 years ago |
|
陆卫豪
|
8dad0bf7cb
|
Merge branch 'dev' of jessica.chen/i3plus-pojo into dev
|
5 years ago |
陈思洁
|
4fec84f810
|
【PTL_PLC配置表增加字段】
|
5 years ago |
|
陆卫豪
|
60ab731ffd
|
Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev
|
5 years ago |
|
陆卫豪
|
d8d48bd913
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
|
陆卫豪
|
dee2d36010
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
joke lin
|
d4e1e854c5
|
[任务：1441 plc推送数据]
|
5 years ago |
|
joke lin
|
5ec9c55784
|
Merge remote-tracking branch 'pojo/dev' into dev
|
5 years ago |
qianhs
|
65572b34a0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
王杰
|
999aae6fc0
|
解决冲突
|
5 years ago |
|
王杰
|
78d7861b44
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
4b8cd0da38
|
ptlpcn enum
|
5 years ago |
许心洁
|
46273325d3
|
动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675）
|
5 years ago |
|
许心洁
|
8a98efa9a6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
eaed7962ab
|
动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+
3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）
|
5 years ago |
|
zcg
|
bd82a0fba7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke lin
|
6b9b44995e
|
Merge remote-tracking branch 'pojo/dev' into dev
|
5 years ago |
 曾贞一
|
38f1bd3b01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
c0ce05e07c
|
【7648 在发运界面增加一个打开单据按钮】
|
5 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
5 years ago |
 钮海涛
|
399fddf33f
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
puxiao.liao
|
4c0b2a1961
|
【 7603 单个零件标签打印功能修改。
】bug7603
|
5 years ago |
|
joke lin
|
4823660070
|
[任务：1435 计划管理]
|
5 years ago |
|
汪云昊
|
f2ccb20095
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
a3ecc3132f
|
表单约束管理
|
5 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
|
王杰
|
d9e4ea8ea9
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
e5a401e5ef
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
8ace0c363d
|
ptl enum
|
5 years ago |
|
王杰
|
dd9468ad14
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
fd79008df6
|
ptl同步配置表添加是否区分工厂字段isIgnoreOrg
|
5 years ago |