 王杰
|
0c0374b1c7
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
608a1d1e51
|
ptl
|
5 years ago |
汪云昊
|
41a39990f4
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
 钮海涛
|
1eaacd1b28
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
333ef54c80
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
|
钮海涛
|
5acc223638
|
Merge branch 'test' of puxiao.liao/i3plus-pojo-lpx into test
|
5 years ago |
|
钮海涛
|
2d5de4a29b
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
puxiao.liao
|
8a7c5fa1b5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
puxiao.liao
|
e3b6f03dd8
|
北京麦格纳WMS#511【511 北京麦格纳-NC报废NC冻结-自动不良品标签打印】
北京麦格纳WMS#510【510 北京麦格纳-拣货-领料任务监控看板】
北京麦格纳WMS#508【508 北京麦格纳-拣货-根据最短路径推荐条码】
北京麦格纳WMS#507【507 北京麦格纳-计划外入库（零星入库）新增，默认批次为生产日期】
北京麦格纳WMS#505【505 北京麦格纳-采购收货-推送收货差异邮件】
北京麦格纳WMS#509【509 北京麦格纳-过期品自动报警】
|
5 years ago |
|
puxiao.liao
|
f5cd46f1f1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
2da53135a8
|
bug7761【7761 发运配料界面，执行成功与无库存未做国际化，翻译资源已配置好】
bug【7766 拆分打印功能操作完成后下方需要回显，拆分出的条码的零件号，条码，数量，库位。】
|
5 years ago |
|
王杰
|
7d743c2c7f
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
61a61f3f30
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
6cfc2c5501
|
ptl
|
5 years ago |
|
汪云昊
|
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 |
|
王杰
|
af4cb74392
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
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 |
|
王杰
|
b6a83fff5d
|
Merge branch 'dev' into test
|
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 |
|
王杰
|
9d23ec7720
|
Merge branch 'dev' into test
|
5 years ago |
宋军超
|
8b9d8fd16d
|
添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体
|
5 years ago |
|
钮海涛
|
47b268ae4a
|
Merge branch 'test' of puxiao.liao/i3plus-pojo-lpx into test
|
5 years ago |
许心洁
|
c214561f3b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
5b92cae5d1
|
3D仓库：联调优化+收货看板BUG#7308
|
5 years ago |
|
puxiao.liao
|
9edfe18aec
|
【7565 收货分组功能要求。】bug7565
|
5 years ago |
|
puxiao.liao
|
9ca00bee68
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
luweihao
|
d1d52ce389
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
8148b1654f
|
补上mes枚举
|
5 years ago |
|
luweihao
|
16879a4f20
|
Merge branch 'dev' into test
|
5 years ago |
|
陆卫豪
|
a65350bbf8
|
Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
|
luweihao
|
8046f4e18d
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
b52bb02d73
|
task `1430` 工位扫描，产品信号监听，队列监听
|
5 years ago |
|
zcg
|
416c2ceffc
|
【任务 1443 excel模板导入功能修改】
|
5 years ago |
|
zcg
|
9388e3b4f2
|
【pojo 冲突提交】
|
5 years ago |
|
puxiao.liao
|
0b1e812f7b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
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 |