luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
|
luweihao
|
8046f4e18d
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
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 |
|
王杰
|
82983809e1
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
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 |
|
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 |
|
王杰
|
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 |
|
王杰
|
b3d3b8236d
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
d34f3b8215
|
2020-03-12/14:59 -- 数据清除定时任务出异常时，将异常信息存进数据库syncErrLog表中
|
5 years ago |
|
钮海涛
|
669874cb9b
|
Merge branch 'dev' into test
|
5 years ago |
|
曾贞一
|
674771de68
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
368986e9d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
1d90195de6
|
3D仓库
|
5 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
 贾文涛
|
ba336893f8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
|
曾贞一
|
0368152e71
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
|
曾贞一
|
4fcd7cbc3f
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
ab8b68c3cd
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
cd19bfb429
|
ptlpcn
|
5 years ago |
汪云昊
|
e0bfb4c660
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
a510196022
|
软删合同禁用启用功能
|
5 years ago |
|
曾贞一
|
f16ac4a1d2
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
|
puxiao.liao
|
277d2c851c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |