jokelone
|
9842ed2181
|
【任务：1193接口pojo】
|
6 years ago |
 王杰
|
e60256e291
|
【需求：1167，包装特殊批次工步】
|
6 years ago |
qianhs
|
48cbf9d471
|
【NC冻结】【350 NC冻结-4.2 批量NC冻结】【1187 NC冻结-4.2 批量NC冻结】
【 库存报表中无法看到寄售零件】【bug6331】
|
6 years ago |
puxiao.liao
|
3bda3169f4
|
【超级移库】bug6295
|
6 years ago |
 钮海涛
|
9597cee596
|
修复删除对象Bug，关联没有删除问题
|
6 years ago |
|
王杰
|
57253ea87b
|
Merge branch 'dev' into test
|
6 years ago |
|
puxiao.liao
|
a441633326
|
【超级移库】bug6295
|
6 years ago |
crish
|
17d5f1e512
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
70683025db
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
97958262b6
|
查询条件优化
|
6 years ago |
|
王杰
|
2660e0268e
|
【需求：1198，代码优化】
|
6 years ago |
汪云昊
|
7cb9ffd37b
|
Lac细节优化
OPC调整
|
6 years ago |
 曾贞一
|
0b9587586d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
7dbb55bcb0
|
【VDA质检】【缺了检验条码数量是否为-bug6402】
|
6 years ago |
陆卫豪
|
95d8dbb908
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
WYnneaoapc
|
7ba63dc9a8
|
6283 打包扫描
|
6 years ago |
jenkins
|
b5685a7874
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
c27daae8e4
|
移动单条码表 --供应商编码
|
6 years ago |
|
陈思洁
|
6de87a1581
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9969916e0a
|
开口合同 -关联单据类型
|
6 years ago |
许心洁
|
3005beda46
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
wei.peng
|
0e1220c329
|
Core 服务 用户查询优化
|
6 years ago |
|
许心洁
|
4ad645d34e
|
流程管家新增触发源（放大镜80）+修改流程BUG#5826#5779+查询类型为可选列表的参数时没有加上软删条件
|
6 years ago |
|
王杰
|
9137555226
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
028d7641d2
|
【需求：1126，设备周期计划优化】
|
6 years ago |
|
crish
|
6567b30178
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
ad6baaa1e6
|
安灯通知方式调试， 日志调试
|
6 years ago |
|
钮海涛
|
58b0f4a531
|
新增BOM树信息获取接口
|
6 years ago |
|
puxiao.liao
|
21375ed6f4
|
【超级移库】bug6295
|
6 years ago |
|
陆卫豪
|
3fa5437c5a
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
37e288ff77
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
|
6 years ago |
|
WYnneaoapc
|
360f908ae4
|
获取生产数据 6283
|
6 years ago |
|
jenkins
|
3d8421e1ec
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
于学杰
|
c3441184c0
|
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/WmsEnumUtil.java
|
6 years ago |
|
汪云昊
|
8ff5d888c2
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
aab18be0e6
|
Lac细节优化
OPC调整
|
6 years ago |
|
qianhs
|
137e473543
|
【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】
|
6 years ago |
|
王杰
|
da0478ec7e
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
ebb59cbb64
|
【需求:1167,批量打包】
|
6 years ago |
|
于学杰
|
b80a5b21ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
bcc7c282ca
|
1. 增加质检单生成类型
|
6 years ago |
|
王杰
|
093008fae8
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
616d39fa38
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
246726a67d
|
【任务：1193 接口基础数据】
|
6 years ago |
|
jenkins
|
c1b50db526
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
49637cb23f
|
【需求:1167,批量打包】
|
6 years ago |
|
汪云昊
|
d23303f07b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
1f85c75f6c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
9b8d4c900b
|
【事物查询】bug6294
|
6 years ago |
1111
|
60ec41e149
|
【采购收货】
|
6 years ago |
|
1111
|
4063929c34
|
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/WmsEnumUtil.java
|
6 years ago |
|
jenkins
|
a7b751d9dc
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
2077c651e7
|
【采购收货】
|
6 years ago |
|
crish
|
4bd4ca8745
|
通知方式， 通知内容
|
6 years ago |
|
WYnneaoapc
|
c1c00213e1
|
工位监控修改 6283
|
6 years ago |
|
汪云昊
|
423d8d2c03
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
|
crish
|
835ea47ba2
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
a30f4aae83
|
andon广播音量可配置， 安灯通知记录
|
6 years ago |
|
jokelone
|
3eeaff50b3
|
【bug：5957工厂初始化】
|
6 years ago |
|
puxiao.liao
|
75701682d2
|
【EU-生产报工撤销】【353生产报工撤销-4.1 处理报工撤销条码组件】【1191生产报工撤销-4.1 处理报工撤销条码组件】
|
6 years ago |
|
许心洁
|
838b7ac311
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
cce413945d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c1476f83c0
|
关闭任务
|
6 years ago |
|
许心洁
|
003ed70f98
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
ee51d54030
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
aa22d18645
|
添加注解
|
6 years ago |
|
crish
|
577b2c462a
|
按照安灯类型统计当天发生的安灯总次数和安灯超时次数
|
6 years ago |
|
WYnneaoapc
|
b595d76056
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
45d14fe3e2
|
枚举增加 生产模式参数 6823
|
6 years ago |
|
许心洁
|
ed7e002f6d
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
7678b95aaa
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
a294c1ccb0
|
安灯看板超时统计功能
|
6 years ago |
|
qianhs
|
6536109b66
|
【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】
|
6 years ago |
|
王杰
|
71bde083a3
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
508618baf6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9b491b742e
|
业务类型枚举维护
|
6 years ago |
|
许心洁
|
738aa2d08c
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
e2249ea8dd
|
【需求：1189，产品条码工步】
|
6 years ago |
|
许心洁
|
ccb29c5903
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
3425b443c8
|
工位监控优化 6283
|
6 years ago |
|
1111
|
f3cb409ca6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
2f2c843006
|
【坤泰-采购收货】包装关系
|
6 years ago |
|
王杰
|
f5c8e36ac9
|
【需求：1189，产品条码工步】
|
6 years ago |
|
王杰
|
649ffb548d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e30ba280e0
|
解决冲突
|
6 years ago |
|
王杰
|
bcf3866ca6
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
5142191f55
|
解决冲突
|
6 years ago |
|
qianhs
|
1453a3d49b
|
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
|
6 years ago |
|
王杰
|
ab34ebb769
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
3b235acda0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
31e24390dd
|
合并冲突
|
6 years ago |
|
WYnneaoapc
|
c93dd66cd9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7b88c605ba
|
枚举修改 1060
|
6 years ago |
|
陈思洁
|
99947f284e
|
枚举修改--移动业务类型
|
6 years ago |
|
qianhs
|
62bb71f4b0
|
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
|
6 years ago |
|
许心洁
|
6d9787dc65
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lpx
|
94dc90172d
|
【扫描查询】bug6246
|
6 years ago |
张哲铭
|
578be0650a
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
43e400d354
|
数据映射类型 更改BigDecimal
|
6 years ago |
|
1111
|
db952282e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |