jokelone
|
c5bc44f29a
|
【bug：6522工位增加序号字段】
|
6 years ago |
 钮海涛
|
f640f97116
|
修复副资源排程Bug
|
6 years ago |
|
钮海涛
|
f969ab4599
|
修复副资源排程Bug
|
6 years ago |
crish
|
55ee26db3c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
f836daf8a6
|
将广播设备写死的代码配置化
|
6 years ago |
陆卫豪
|
62800f757e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
WYnneaoapc
|
185b40a586
|
6518 管控代码修改
|
6 years ago |
|
钮海涛
|
bed955575d
|
修复规则组合关联问题
|
6 years ago |
|
jokelone
|
ce63c161be
|
【任务：1211报表功能开发：生产报表】
|
6 years ago |
jenkins
|
04ae04246e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
549f63aa0d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
07bda76d4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
b181cf2ac3
|
【安全库存拉动】
|
6 years ago |
|
许心洁
|
77b921ef38
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b0c4d11000
|
流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304）
|
6 years ago |
|
jenkins
|
edc281dffe
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
qinjia zou
|
51d70654ef
|
【欧洲-生产快速入库】bug6389
|
6 years ago |
 王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
王杰
|
71d39f54d2
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
c595d3f6b1
|
修改字段
|
6 years ago |
|
陆卫豪
|
d6ff7aa2b1
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
wei.peng
|
492367670b
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
59d6eb0727
|
添加系统配置接口
|
6 years ago |
|
王杰
|
5943854c5b
|
增加字段
|
6 years ago |
|
jokelone
|
054502b657
|
【任务：1193接口调试】
|
6 years ago |
|
钮海涛
|
695ab094d2
|
修复资源表多选枚举显示问题。
|
6 years ago |
|
钮海涛
|
89943f6586
|
修复资源表多选枚举显示问题。
|
6 years ago |
|
qinjia zou
|
7a134dc0cb
|
【欧洲-生产快速入库】bug6389
|
6 years ago |
|
jenkins
|
8eb8c2f97e
|
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
7b47c7b942
|
修复关联对象字段显示问题
|
6 years ago |
|
王杰
|
9f9c095846
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
4441d1dc86
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
WYnneaoapc
|
88d480403c
|
数据库字段初始化属性 赋值longtext
|
6 years ago |
|
crish
|
92c1e846b6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
汪云昊
|
c4ed0f1f37
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
12ba5d2ff3
|
lac微服务模式优化
|
6 years ago |
1111
|
e0a5b36061
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
许心洁
|
b88a879c58
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
jenkins
|
603004c190
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
1720952d23
|
修复自定义字段表达式取值问题
|
6 years ago |
|
crish
|
3645541765
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
d35c6e97cd
|
【采购收货】
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
9baac06cb7
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e91369c82a
|
【需求：1198】
|
6 years ago |
|
陆卫豪
|
0fad1e4df5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
23b3ae88e5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
0e9b9b26fd
|
包装打印逻辑修改
|
6 years ago |
|
jenkins
|
e7bad502c3
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
96ea008725
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
c0d8375d0f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
1111
|
41a48b4b59
|
【采购收货】 采购收货
|
6 years ago |
|
许心洁
|
8d6a2b53b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b7c6189308
|
生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）
|
6 years ago |
|
jenkins
|
4be5d5e1aa
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
8f07751100
|
LAC 日志记录查询完成
|
6 years ago |
|
汪云昊
|
c60213ad3e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
2ad6d16684
|
参数重复校验错误
|
6 years ago |
qianhs
|
d4422bee15
|
【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】
|
6 years ago |
|
王杰
|
7a023d0f4b
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
fe962c1ab3
|
【bug:6483】
|
6 years ago |
|
王杰
|
3c3de49512
|
【bug:6483】
|
6 years ago |
|
crish
|
6c07f29317
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
407fdbf217
|
修复对象关联删除出错问题
|
6 years ago |
|
王杰
|
64d631c180
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
e5db689881
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
85e35eede1
|
解决冲突
|
6 years ago |
|
汪云昊
|
f95482501b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
efea8980e7
|
解除冲突
|
6 years ago |
|
汪云昊
|
5a2a2a5e8d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
|
6 years ago |
|
jenkins
|
092f72872b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
4b17995206
|
LAC 日志记录Cache 完成
|
6 years ago |
|
王杰
|
7f08847c50
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
6297ccc4d7
|
Merge branch 'dev' into test
|
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 |
|
wei.peng
|
02a9c64a42
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
陆卫豪
|
4a76c480ac
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
6 years ago |
|
陆卫豪
|
82fd56dc68
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
12a66262be
|
解决冲突
|
6 years ago |
|
WYnneaoapc
|
fdd051f2dd
|
打印修复
|
6 years ago |
|
jenkins
|
f76aaddbd5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
qianhs
|
a55795d43f
|
【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】
|
6 years ago |
|
许心洁
|
3559962ccb
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
qianhs
|
f0b35d1d74
|
【VDA生产退料-条码所在库位-需为线边库位】【bug6442】
【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】
【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】
|
6 years ago |
|
jenkins
|
4d2a2a35b0
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
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 |
|
王杰
|
1a7164c474
|
Merge branch 'dev' into test
|
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 |
|
王杰
|
57253ea87b
|
Merge branch 'dev' into test
|
6 years ago |
|
puxiao.liao
|
a441633326
|
【超级移库】bug6295
|
6 years ago |
|
crish
|
5b6b303722
|
Merge branch 'test'
|
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 |
|
crish
|
410558d43c
|
Merge branch 'test'
|
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 |
|
许心洁
|
60c25d7a71
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
许心洁
|
208410340e
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
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 |
|
1111
|
7378df1b9e
|
【宁德问题清单】
|
6 years ago |
|
许心洁
|
b6e27c33c8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
a04b8f7c57
|
【bug：5791 生产工单明细1】
|
6 years ago |
|
jokelone
|
5fd619ac79
|
【bug：5791生产工单明细】
|
6 years ago |
|
王杰
|
75e7aa30c2
|
Merge branch 'dev' into test
|
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 |
|
王杰
|
acaacf63a3
|
Merge branch 'dev' into test
|
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 |
|
张哲铭
|
6871e96496
|
Merge branch 'dev' into test
|
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 |
|
张哲铭
|
8e19f4dde3
|
Merge branch 'dev' into test
|
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 |
|
王杰
|
bc14fcf027
|
Merge branch 'dev' into test
|
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 |
|
crish
|
c4d7a2380c
|
Merge branch 'test'
|
6 years ago |
|
jokelone
|
755e920513
|
【bug：6250 返工返修拆解优化】
|
6 years ago |
|
张哲铭
|
efbe0dfce9
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
lpx
|
fc49ddeea5
|
【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】
|
6 years ago |
|
lpx
|
fc79b1b0f3
|
【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】
|
6 years ago |
|
王杰
|
aa2f514f6c
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
029c9b6bc8
|
代码审核 修改1
|
6 years ago |
|
王杰
|
980ae89cdf
|
【需求id：1162，pcn登陆】
|
6 years ago |
|
许心洁
|
970105ac19
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
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 |
|
许心洁
|
e433915759
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
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 |
|
陆卫豪
|
64be0c721c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
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 |
|
许心洁
|
017cd18950
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
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 |
|
许心洁
|
9755e5f751
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
809e23aad7
|
1:修复启动时从数据库加载数据时的Bug。
|
6 years ago |
|
钮海涛
|
7aa078e7ce
|
1:修复未设置基准时间的Bug
|
6 years ago |
|
wei.peng
|
da7ba77dab
|
LAC 跨服务调用软适配接口完成
|
6 years ago |
|
陆卫豪
|
46fc5f5750
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
a6e8265e29
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jokelone
|
90ec0f107e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
32dbaed8fe
|
【任务：1129数据对象、对象结构、产品包装关系基础数据】
|
6 years ago |
|
WYnneaoapc
|
4308084ca3
|
数据抽取修改 1130
|
6 years ago |
|
王杰
|
d2c7a81893
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
d69e863959
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
3ef115bbe2
|
新增冗余字段
|
6 years ago |
|
汪云昊
|
23f0503454
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
1215a5c658
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
855cc46448
|
数据抽取修改 1116
|
6 years ago |
|
wei.peng
|
0ba20f0094
|
LAC 日志查询接口功能完成
|
6 years ago |
|
陆卫豪
|
07a80e7fd2
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
46e0488d5a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
1de5b8b196
|
数据抽取修改 1116
|
6 years ago |
|
wei.peng
|
0d777d1894
|
LAC 日志处理功能完成
|
6 years ago |
|
crish
|
851ba63e7c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
f111febd8d
|
修改“其他”安灯类型的名字为“自处理”， 统一修改获取组织代码的方法
|
6 years ago |
|
wei.peng
|
3645368544
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
b963bcb502
|
LAC 日志处理功能完成
|
6 years ago |
|
汪云昊
|
dd0de76d4d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
219bf6db9a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
qianhs
|
457e10bc75
|
1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】
|
6 years ago |
|
许心洁
|
04453aa706
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
gaochangjiang
|
d0165fd342
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
陈思洁
|
2414993cf9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
777060450e
|
新增字段--目标库位
|
6 years ago |
|
gaochangjiang
|
047b9d5e35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gaochangjiang
|
02e3ac4960
|
【库存预警】bug 修复库存预警
|
6 years ago |
|
汪云昊
|
25425822a8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
154bba4b3b
|
LAC 调度模式优化
|
6 years ago |
|
WYnneaoapc
|
7f9f9cb242
|
返工返修pojo字段更改 1092
|
6 years ago |
|
陆卫豪
|
576f02f75d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
9ad66157a8
|
数据同步优化 1078-4
|
6 years ago |
|
钮海涛
|
2c47556abf
|
1：新增工作计划资源位置插入逻辑
|
6 years ago |
|
jokelone
|
93438e1bdb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
21087d5d4d
|
【需求：1092 工序BOM和物料绑定记录模板增加构造方法】
|
6 years ago |
|
王杰
|
2417b40635
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
921be6b0f2
|
1：新增工作计划资源位置插入逻辑
|
6 years ago |
|
汪云昊
|
ba7c713b6f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
cfd7f5276e
|
实体调整
|
6 years ago |
|
crish
|
6996dc2273
|
6204: MesConfig配置添加业务主键
|
6 years ago |
|
WYnneaoapc
|
4ceef3c6d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
6087fe0c2c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
80c340308a
|
1. 修改通用接口POJO中的字段长度
|
6 years ago |
|
WYnneaoapc
|
35f625ac21
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
563955570d
|
数据同步优化 1078
|
6 years ago |
|
许心洁
|
9c54b2561c
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
e0ec7bb377
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
50bf9300ba
|
LAC 调度模式完成
|
6 years ago |
|
王杰
|
a95b6baae1
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
828cf66784
|
【需求：1090 工序BOM，物料绑定记录删除多余字段】
|
6 years ago |
|
王杰
|
cb319e4304
|
【需求：1126，设备周期计划】
|
6 years ago |
|
王杰
|
dfec2532cb
|
Merge branch 'dev' into test
|
6 years ago |
|
lpx
|
00954f2917
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
lpx
|
69be002972
|
【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】
|
6 years ago |
|
jokelone
|
4dcbcf068a
|
【需求：1090 产品类型图片增加字段】
|
6 years ago |
|
王杰
|
7291a7a85c
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
86a18d730a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
4b66ec0e87
|
任务实例id
|
6 years ago |
|
汪云昊
|
9907813aed
|
Lac调度实体
|
6 years ago |
|
许心洁
|
c9f26c22c1
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
7ee96d1444
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
6fd7e6be5f
|
【需求：1092 维修类型】
|
6 years ago |
|
许心洁
|
bbec6a1002
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7799937093
|
成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除
|
6 years ago |
|
许心洁
|
b112bdb5e8
|
成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除
|
6 years ago |
|
王杰
|
75ce77f6f1
|
【需求：1126，设备周期计划】
|
6 years ago |
|
钮海涛
|
6a1990a215
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
钮海涛
|
2e02d77966
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
王杰
|
347c47c82f
|
【需求：1125，设备报表】
|
6 years ago |
|
王杰
|
1846c6f4f8
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
438517be44
|
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 |
|
jokelone
|
6c847cf305
|
【需求：1091 返厂返修添加字段和枚举】
|
6 years ago |
|
王杰
|
2069d6a3ae
|
【需求：1125，设备报表】
|
6 years ago |
|
王杰
|
9446a76159
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
f67a61ec92
|
网关 添加 APS 路由
BASE URL 路径优化
|
6 years ago |
|
wei.peng
|
aeff042046
|
添加 组织代码查询
|
6 years ago |
|
曾贞一
|
ed9e388c8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
1357dfad30
|
【VDA收货-- 前端PC端POsn页】任务号1102
【VDA收货-- 问题清单中加密库位】任务号1104
【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112
【VDA收货-- 对于分组数据如何查看分组信息】任务号1111
|
6 years ago |
|
WYnneaoapc
|
b668879f9d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
42ec1b3693
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
2f382d37cc
|
【需求：1124，首检件配置】
|
6 years ago |
|
jokelone
|
0011a4bc56
|
【需求：1089 过程检测数据 增加字段】
|
6 years ago |
|
王杰
|
dcaf007f4d
|
【需求：1107，生产工单首检件】
|
6 years ago |
|
WYnneaoapc
|
29ac92566d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
b05711dc6c
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
许心洁
|
6d59aeddad
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
jiajack
|
3c8b920a4c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
95789b1bd8
|
增加生产质量情况BI业务
|
6 years ago |
|
钮海涛
|
794bbc4fba
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
王杰
|
35cf3cf162
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
bc13a8a3ac
|
【需求：1090 返厂返修增加分页查询】
|
6 years ago |
|
钮海涛
|
5b712ce774
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
许心洁
|
dd86ce354a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b8842edbb1
|
无条码打印：新功能开发完成
|
6 years ago |
|
WYnneaoapc
|
dbd4a7578b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
88af19f8e9
|
修改开发环境pom文件test为dev
|
6 years ago |
|
changjiang.gao
|
376ca4bbd4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
3f6f6428f6
|
【需求:1106,设备通知，优化】
|
6 years ago |
|
changjiang.gao
|
13066bd4d1
|
【库存预警】bug 243
|
6 years ago |
|
WYnneaoapc
|
04c99167c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
6de6d36e80
|
数据库抽取反写 1105-1
|
6 years ago |
|
jokelone
|
a5609d97fb
|
【1092 返厂返修增加枚举】
|
6 years ago |
|
钮海涛
|
d99ad6c44a
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
王杰
|
03a4c98234
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
803d5c57f2
|
【需求1101，设备维修作业，第3次提交】
|
6 years ago |
|
wei.peng
|
699276777a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
7496eb4a1b
|
LAC 全部 CRUD 接口完成
|
6 years ago |
|
钮海涛
|
5183163abd
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
WYnneaoapc
|
e6e2e9fb22
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
18161e8191
|
Merge branch 'test'
|
6 years ago |
|
crish
|
67461457fc
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
1e0f0c706c
|
安灯问题修复
|
6 years ago |
|
crish
|
f093a97cf0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
4eaa8b5b17
|
导入导出
|
6 years ago |
|
crish
|
6902c79472
|
问题清单问题修复
|
6 years ago |
|
crish
|
7d8b8664cc
|
问题清单问题修复
|
6 years ago |
|
WYnneaoapc
|
848f6b2f23
|
工位监控优化 1050-6
|
6 years ago |
|
WYnneaoapc
|
c71d667d0f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
56996126be
|
【需求：1101，mes同步设备安灯维修任务】
|
6 years ago |
|
jokelone
|
d7f55250ef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
8d10a46953
|
(1092 MesProdBindRecordModel增加有参构造方法)
|
6 years ago |
|
changjiang.gao
|
30007cee47
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9bdae2ad13
|
【需求：1086，设备点检保养作业】
|
6 years ago |
|
WYnneaoapc
|
c56822dc40
|
工位监控优化 1050-5
|
6 years ago |
|
WYnneaoapc
|
3dbbee3c60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
f6b06e6b52
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
aef7f7a948
|
增加班次顺序字段
|
6 years ago |
|
jiajack
|
d87d81e34a
|
【产线运行情况】-BI报表开发
|
6 years ago |
|
许心洁
|
73aef5326c
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
d0b98f0869
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
00e849a62e
|
(1089 过程质量检测基础数据；1090 返厂返修基础数据)
|
6 years ago |
|
许心洁
|
3bc277178e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
f7fbd1c24f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
3e9cc95017
|
pojo-model加入andon-pojo依赖
|
6 years ago |
|
陈思洁
|
42189da443
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
a90aa8498f
|
实体修改字段类型【int】改成【Integer】
|
6 years ago |
|
crish
|
e15e402890
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
2906667856
|
mes定时获取安灯安灯任务信息
|
6 years ago |
|
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
16162542ba
|
1：修改listByPage由GET方法为POST方法。
|
6 years ago |
|
lpx
|
ca0cf21a7c
|
【NC解冻-4.2 组件复用】PR12-01~PR12-02
|
6 years ago |
|
wei.peng
|
4c6f0b0d57
|
添加 CRUD Base
|
6 years ago |
|
陈思洁
|
935845704a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
e5b5891d23
|
bom信息中新增冗余字符
|
6 years ago |
|
crish
|
a537daee62
|
导出不导出有效性
|
6 years ago |
|
qianhs
|
caf6dc17ab
|
【NC冻结】nc冻结
|
6 years ago |
|
crish
|
fd5c6b2c9d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
0824a58ead
|
安灯定时自处理job, 广播播报内容优化
|
6 years ago |
|
WYnneaoapc
|
34a9ad36fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
1d0a2351b9
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
1f9fc9f280
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
许心洁
|
44fccb14d6
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
0c01648551
|
【需求：1088，设备维修作业】
|
6 years ago |
|
WYnneaoapc
|
b47f97fa05
|
1050-2 工位监控
|
6 years ago |
|
王杰
|
09cff08e1e
|
[需求1086，设备点检保养作业，第2次提交]
|
6 years ago |
|
王杰
|
752476b3df
|
[需求1086，设备点检保养作业，第2次提交]
|
6 years ago |
|
许心洁
|
f5a8e9f130
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
d5a45176d0
|
LAC 任务类型、指令集类型 对象优化
|
6 years ago |
|
曾贞一
|
610a96d2ee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
6b9c7b3ced
|
【VDA库存调整盘点】 添加供应商字段
|
6 years ago |
|
许心洁
|
77fefbcf74
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
e12ba1d839
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
d5864ba490
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
6816c7b566
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
wei.peng
|
5e78c31a70
|
LAC 名称修改
|
6 years ago |
|
wei.peng
|
e8f8c941c9
|
LAC 指令集类型CRUD接口完成
LAC 任务类型CRUD接口完成
|
6 years ago |
|
许心洁
|
04df70114d
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
e593cc875d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
changjiang.gao
|
2ba7596a57
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
25f11781c1
|
盘点差异增加字段
|
6 years ago |
|
许心洁
|
ba7fe81978
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5956d5a08e
|
冲销：需求变更优化
|
6 years ago |
|
王杰
|
07749b50ec
|
[需求：1086， mes设备点检保养作业]
|
6 years ago |
|
曾贞一
|
26b4a5c52c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
a9045ed403
|
bug 5953
|
6 years ago |
|
陈思洁
|
aaa0636920
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
a54d711d95
|
#1085 BOM导入接口新增
|
6 years ago |
|
crish
|
15e812c7a6
|
Merge branch 'test'
|
6 years ago |
|
crish
|
7d20321be5
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
10bc56cf46
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
901e37d6e7
|
修复bug
|
6 years ago |
|
许心洁
|
02055a8b7e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
f9b09ce2c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陆卫豪
|
9558225174
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
87ffdfd9a3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
18789939b0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
ac7b0415ba
|
1083 添加枚举字段
|
6 years ago |
|
汪云昊
|
5c67a7bb5f
|
MySQL 数据库不支持 CAST AS DOUBLE，需要改成 CAST AS DECIMAL
|
6 years ago |
|
王杰
|
081d792b98
|
mes设备通知
|
6 years ago |
|
crish
|
fa4f58ec6c
|
pom冲突
|
6 years ago |
|
crish
|
0526da8ee3
|
Merge branch 'test'
|
6 years ago |
|
crish
|
cd74f5336f
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
9bce0549a7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
dbc69e957a
|
1. 供应商物料实体增加字段
|
6 years ago |
|
crish
|
35241794c9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
bdb818930b
|
安灯广播，自处理
|
6 years ago |
|
wei.peng
|
689f6057c1
|
添加查询账号接口
|
6 years ago |
|
王杰
|
fa25769c50
|
mes枚举
|
6 years ago |
刘辉
|
e89df89f9a
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
0d0178545c
|
mes设备
|
6 years ago |
|
WYnneaoapc
|
44f2b1e826
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
WYnneaoapc
|
e8336c85d7
|
idea 异常 文件格式化
|
6 years ago |
|
changjiang.gao
|
f2453163b6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
3ab8cf112d
|
盘点条码差异
|
6 years ago |
|
WYnneaoapc
|
1eca1a963a
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
|
6 years ago |
|
WYnneaoapc
|
2da78c3237
|
idea 异常 文件格式化 + 包装扫描工步
|
6 years ago |
|
jokelone
|
7139d9b5f1
|
解决冲突
|
6 years ago |
|
jokelone
|
9e4930968f
|
解决冲突
|
6 years ago |
|
jokelone
|
8a517bc0b9
|
返厂返修增加字段
|
6 years ago |
|
刘辉
|
febbea09c3
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
changjiang.gao
|
8808a77de6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
69e8357c69
|
条码数量编辑
|
6 years ago |
|
于学杰
|
63e225026c
|
1. 扩展通用接口功能，支持与软适配的对接
|
6 years ago |
|
crish
|
b8225e8bcd
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
0fdabe4950
|
知识库 ，自处理开发
|
6 years ago |
|
刘辉
|
4ffc63ce83
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
bleakney.liu
|
f6be80db01
|
增加groupby 构造函数
|
6 years ago |
|
许心洁
|
a1597c089c
|
成品冲销+导入转换格式（就一个不知道是什么单导入）
|
6 years ago |
|
钮海涛
|
5a682467d1
|
1：在字段信息表中新增枚举项数组，前端在选择枚举内容时不需要再从后端获取。
|
6 years ago |
|
王杰
|
b0f85a2bdc
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
1d3fc8b5c9
|
mes作业任务
|
6 years ago |
|
许心洁
|
9fa2f376e4
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
2dc63a9a4e
|
1：修改部分字段默认在界面不显示
2：为字段新增默认值。
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |