wei.peng
|
4b17995206
|
LAC 日志记录Cache 完成
|
6 years ago |
jokelone
|
5e813f30e7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
f632308d0a
|
【任务：1193接口数据解析】
|
6 years ago |
 王杰
|
2a5c32b8ea
|
解决冲突
|
6 years ago |
陈思洁
|
5050c0c5a1
|
新增实体--安全库存
|
6 years ago |
qinjia zou
|
2210482918
|
【自动入库】bug6390
|
6 years ago |
汪云昊
|
13f77e69c1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
qinjia zou
|
a8ebcb669b
|
【自动入库】bug6390
|
6 years ago |
|
qinjia zou
|
6e8977e5aa
|
【自动入库】bug6390
|
6 years ago |
 钮海涛
|
e3ba4f6349
|
新增规则组合执行接口
|
6 years ago |
|
jokelone
|
e046553788
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
987a502d7e
|
【bug：6380 物料字段拼写有误】
|
6 years ago |
WYnneaoapc
|
12a66262be
|
解决冲突
|
6 years ago |
|
WYnneaoapc
|
fdd051f2dd
|
打印修复
|
6 years ago |
qianhs
|
a55795d43f
|
【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】
|
6 years ago |
|
qianhs
|
f0b35d1d74
|
【VDA生产退料-条码所在库位-需为线边库位】【bug6442】
【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】
【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】
|
6 years ago |
许心洁
|
339a12eba3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
3781713a29
|
实时库存-条码明细优化查询速度
|
6 years ago |
于学杰
|
9e625acc0d
|
1. MOVE_TO_ERP 增加是否预收货字段
|
6 years ago |
 曾贞一
|
3ba4e9b4f1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
28078287af
|
【VDA收货】【预收货的单据，要在页面上可以查询-bug6465】
|
6 years ago |
|
王杰
|
f6d50bdfb7
|
【需求：1167，产品批量打包】
|
6 years ago |
|
王杰
|
693ac2451e
|
【需求：1167，产品批量打包】
|
6 years ago |
|
于学杰
|
71818c4745
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
db9a698c68
|
1. 增加是否寄售的属性
|
6 years ago |
|
jokelone
|
4cec8e8ac8
|
【任务：1193接口物料拆解增加工位字段】
|
6 years ago |
|
汪云昊
|
b4976be85e
|
LAC执行流程调试
UA订阅次数问题
|
6 years ago |
|
王杰
|
b15c3f4ae7
|
【需求：1101，定时任务优化】
|
6 years ago |
|
jokelone
|
9ca2760866
|
【任务：1193接口repository】/s
|
6 years ago |
|
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 |
|
puxiao.liao
|
a441633326
|
【超级移库】bug6295
|
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 |
|
WYnneaoapc
|
7ba63dc9a8
|
6283 打包扫描
|
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 |
|
王杰
|
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 |
|
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 |
|
于学杰
|
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 |
|
王杰
|
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 |
|
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 |
|
王杰
|
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 |
|
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 |
|
许心洁
|
cce413945d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c1476f83c0
|
关闭任务
|
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 |
|
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 |
|
陈思洁
|
508618baf6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
9b491b742e
|
业务类型枚举维护
|
6 years ago |
|
王杰
|
e2249ea8dd
|
【需求：1189，产品条码工步】
|
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 |
|
王杰
|
e30ba280e0
|
解决冲突
|
6 years ago |
|
王杰
|
5142191f55
|
解决冲突
|
6 years ago |
|
qianhs
|
1453a3d49b
|
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
|
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 |
lpx
|
94dc90172d
|
【扫描查询】bug6246
|
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 |
|
1111
|
7378df1b9e
|
【宁德问题清单】
|
6 years ago |
|
jokelone
|
a04b8f7c57
|
【bug：5791 生产工单明细1】
|
6 years ago |
|
jokelone
|
5fd619ac79
|
【bug：5791生产工单明细】
|
6 years ago |
|
王杰
|
84bf5ba64a
|
【需求：1162，pcn登陆】
|
6 years ago |
|
陈思洁
|
04e876250b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
58c9795b7c
|
移动类型、业务类型维护数据
|
6 years ago |
|
WYnneaoapc
|
b4cea27a5b
|
代码审核 修改2
|
6 years ago |
|
WYnneaoapc
|
56e6cf7918
|
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/MesEnumUtil.java
|
6 years ago |
|
1111
|
88a69ac7f8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
71c867dd8c
|
【包装规格】
|
6 years ago |
|
许心洁
|
ac43296df3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5dc8ffb394
|
日志处理队列V1.0
|
6 years ago |
|
钮海涛
|
8e614bcb72
|
1:增加多选枚举的功能。
|
6 years ago |
|
钮海涛
|
6be9a55983
|
1:增加多选枚举的功能。
|
6 years ago |
|
钮海涛
|
f85dd4cbe5
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
eeebbfd1fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
alwaysfrin
|
759f9ee819
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
e26dadca01
|
【需求：1162，pcn登陆】
|
6 years ago |
|
汪云昊
|
dcbb6a7a1c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
053b3ae0e4
|
LAC 前端联调调整
|
6 years ago |
|
alwaysfrin
|
da582b871d
|
日志处理优化
|
6 years ago |
|
jokelone
|
755e920513
|
【bug：6250 返工返修拆解优化】
|
6 years ago |
|
lpx
|
fc49ddeea5
|
【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】
|
6 years ago |
|
lpx
|
fc79b1b0f3
|
【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】
|
6 years ago |
|
WYnneaoapc
|
029c9b6bc8
|
代码审核 修改1
|
6 years ago |
|
王杰
|
980ae89cdf
|
【需求id：1162，pcn登陆】
|
6 years ago |
|
jokelone
|
b6d7156b0b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
9a6c5cfda3
|
【任务：1163客户订单】
|
6 years ago |
|
王杰
|
b2886012a5
|
【需求id：1162，pcn登陆】
|
6 years ago |
|
qianhs
|
c68cb7889e
|
【VDA物料拆分-输入数量-数量检验】【6233】
|
6 years ago |
|
钮海涛
|
bd834a24cb
|
1:增加资源甘特图获取数据接口
|
6 years ago |
|
曾贞一
|
c2d3e044fb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
be75c4ec42
|
【VDA质检--物料信息维护】任务号1135
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
|
6 years ago |
|
WYnneaoapc
|
4b47ceb42d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
3b447fa77a
|
数据抽取修改 1130
|
6 years ago |
|
jokelone
|
bdce8a7103
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
9418a0838b
|
【任务：1129 产品编码配置基础数据】
|
6 years ago |
|
钮海涛
|
64cda23c12
|
1:增加资源甘特图获取数据接口
|
6 years ago |
|
曾贞一
|
d428aa302d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b7071bd0db
|
供应商字段 添加
|
6 years ago |
|
crish
|
87d9b5c6ec
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
1a7fda268b
|
andon 系统配置
|
6 years ago |
|
钮海涛
|
809e23aad7
|
1:修复启动时从数据库加载数据时的Bug。
|
6 years ago |