许心洁
|
313a0acfb8
|
test
|
6 years ago |
 王杰
|
b6a83fff5d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
ddcb46e8e0
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
0b8c3317b8
|
ptlpcn enum
|
6 years ago |
zcg
|
3d28840bae
|
【新增枚举，pojo】
|
6 years ago |
|
zcg
|
b28c092ade
|
【新增枚举】
|
6 years ago |
|
王杰
|
9d23ec7720
|
Merge branch 'dev' into test
|
6 years ago |
宋军超
|
8b9d8fd16d
|
添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体
|
6 years ago |
 钮海涛
|
47b268ae4a
|
Merge branch 'test' of puxiao.liao/i3plus-pojo-lpx into test
|
6 years ago |
|
许心洁
|
c214561f3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5b92cae5d1
|
3D仓库：联调优化+收货看板BUG#7308
|
6 years ago |
puxiao.liao
|
9edfe18aec
|
【7565 收货分组功能要求。】bug7565
|
6 years ago |
|
puxiao.liao
|
9ca00bee68
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
luweihao
|
d1d52ce389
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
8148b1654f
|
补上mes枚举
|
6 years ago |
|
luweihao
|
16879a4f20
|
Merge branch 'dev' into test
|
6 years ago |
|
陆卫豪
|
a65350bbf8
|
Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
12579c7a14
|
还原pom
|
6 years ago |
|
luweihao
|
8046f4e18d
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
6 years ago |
|
zcg
|
416c2ceffc
|
【任务 1443 excel模板导入功能修改】
|
6 years ago |
|
zcg
|
9388e3b4f2
|
【pojo 冲突提交】
|
6 years ago |
|
puxiao.liao
|
0b1e812f7b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
luweihao
|
679319635a
|
task `1430` 工位扫描，产品信号监听，队列监听
|
6 years ago |
|
陆卫豪
|
8dad0bf7cb
|
Merge branch 'dev' of jessica.chen/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
4fec84f810
|
【PTL_PLC配置表增加字段】
|
6 years ago |
|
陆卫豪
|
60ab731ffd
|
Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev
|
6 years ago |
|
陆卫豪
|
d8d48bd913
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
6 years ago |
|
陆卫豪
|
dee2d36010
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
qianhs
|
c4d1c8ea9c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
joke lin
|
d4e1e854c5
|
[任务：1441 plc推送数据]
|
6 years ago |
|
joke lin
|
5ec9c55784
|
Merge remote-tracking branch 'pojo/dev' into dev
|
6 years ago |
|
qianhs
|
65572b34a0
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
6 years ago |
|
王杰
|
999aae6fc0
|
解决冲突
|
6 years ago |
|
王杰
|
78d7861b44
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
82983809e1
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
6 years ago |
|
王杰
|
4b8cd0da38
|
ptlpcn enum
|
6 years ago |
|
puxiao.liao
|
8f584f250b
|
【7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件
】bug7633
|
6 years ago |
|
puxiao.liao
|
be479c2e76
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
46273325d3
|
动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675）
|
6 years ago |
|
许心洁
|
8a98efa9a6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
eaed7962ab
|
动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+
3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）
|
6 years ago |
|
zcg
|
bd82a0fba7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke lin
|
6b9b44995e
|
Merge remote-tracking branch 'pojo/dev' into dev
|
6 years ago |
 曾贞一
|
38f1bd3b01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
c0ce05e07c
|
【7648 在发运界面增加一个打开单据按钮】
|
6 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
6 years ago |
|
钮海涛
|
399fddf33f
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
6 years ago |
|
puxiao.liao
|
4c0b2a1961
|
【 7603 单个零件标签打印功能修改。
】bug7603
|
6 years ago |
|
joke lin
|
4823660070
|
[任务：1435 计划管理]
|
6 years ago |