 钮海涛
|
d819f7b6c7
|
修复报表分页问题
|
6 years ago |
jenkins
|
66252032b3
|
Jenkins自动合并
|
6 years ago |
陈思洁
|
9cb03c8661
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c6ff8f109c
|
新增附件信息表
|
6 years ago |
 王杰
|
be39fb2abe
|
Merge branch 'dev' into test
|
6 years ago |
jokelone
|
ff69583e8d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
19c0c1deb5
|
【任务：1211报表】
|
6 years ago |
汪云昊
|
56381b76f1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
db019bf4eb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
d44d5d79ab
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
26e7f975bf
|
数据源适配器支持IN
|
6 years ago |
|
钮海涛
|
0dddbb936c
|
新增报表接口
|
6 years ago |
|
jenkins
|
6d9a2b5b80
|
2019年11月27日12:14:44
|
6 years ago |
wei.peng
|
84d341aa87
|
Jenkins 自动合并代码测试
|
6 years ago |
|
汪云昊
|
f5a0f24355
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
a0f1eab0f9
|
Jenkins 自动合并代码测试
|
6 years ago |
|
汪云昊
|
f2c0c1206a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
ad0389fb13
|
JOB日志优化
|
6 years ago |
|
汪云昊
|
3faa679cf9
|
Job测试
新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口
|
6 years ago |
|
王杰
|
6da48220a5
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3aa69e0262
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
6959d126a0
|
增加枚举
|
6 years ago |
puxiao.liao
|
1d66ce2612
|
【VDA推荐入库-入库成功-无引导信息】bug6645
|
6 years ago |
crish
|
cba2cda2d4
|
安灯主界面部分字段赋初始值
|
6 years ago |
|
crish
|
376700de0d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
06e969af1b
|
安灯主界面
|
6 years ago |
|
钮海涛
|
d4f963ee70
|
新增报表接口
|
6 years ago |
|
jenkins
|
c8b0c49b57
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
544944d31c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
d0e6d30a9e
|
#6639 【VDA生产领料-FIFO跳过-系统异常】
|
6 years ago |
gcj
|
e827462426
|
【采购收货】
|
6 years ago |
|
crish
|
74224b20ac
|
安灯主界面开发
|
6 years ago |
陆卫豪
|
7556ada2d4
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
9e64ee8258
|
【需求：1221，导入】
|
6 years ago |
|
jenkins
|
8a34eee5c5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
a49fdf87b8
|
【任务：1211报表质量数据】
|
6 years ago |
|
陈思洁
|
42a6f8a02d
|
【#1219 在宁德现有生产扣减JOB基础上增加生成领料单功能】
|
6 years ago |
|
陈思洁
|
d5ff3e4ce1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
54d3e351be
|
合并冲突
|
6 years ago |
|
陆卫豪
|
5af777c4fd
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
WYnneaoapc
|
b69bd1ae53
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
ed89db8be3
|
6565 更新 同步流程
|
6 years ago |
|
jenkins
|
dcd36cb6e5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
gcj
|
af1324e9c7
|
【采购收货】
|
6 years ago |
|
wei.peng
|
6d5fc7ab39
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
25cbbb5837
|
雪花ID 生成器 改为prop 配置
|
6 years ago |
许心洁
|
e5767574fe
|
任务明细POJO添加交易类型代码字段：唯一索引
|
6 years ago |
|
王杰
|
73b1e827d6
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
1ab2c3605a
|
【需求：1221，导入】
|
6 years ago |
|
gcj
|
87dd679d47
|
【采购收货】
|
6 years ago |
|
许心洁
|
151a7d65c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
48e136c4aa
|
任务列表展示创建人
|
6 years ago |
|
王杰
|
e9055e3c5d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
2893d13e9f
|
需求1221，导入
|
6 years ago |
|
WYnneaoapc
|
30aa0bb099
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
c770dda7b2
|
问题修改 6283
|
6 years ago |
|
许心洁
|
e37653c544
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
214b3a07b7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
f39e16511f
|
给所有JOB加上了redis锁+IOT解析优化+系统配置POJO参数值的类型改为长整形，否则新增时参数值过长会系统异常
|
6 years ago |
|
jenkins
|
5947429d54
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
于学杰
|
8d15084b20
|
1. 调整5个批次的名称
|
6 years ago |
|
jenkins
|
68b650ab81
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
8447ef39c9
|
【采购收货】
|
6 years ago |
|
jenkins
|
870dc7007d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
acbbbf8e32
|
【采购收货】
|
6 years ago |
|
jokelone
|
902ef5b177
|
【bug：6577缺陷获取字段修改】
|
6 years ago |
|
jenkins
|
f6506bdd0b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
 曾贞一
|
ca6b596b14
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
47ccfcc9e3
|
【EU成品发运-检查数量组件】【bug1177】
【EU成品发运-检查单据是否操作完成组件】【bug1176】
【EU成品发运-成品发运FIFO推荐组件】【bug1174】
|
6 years ago |
|
王杰
|
1d920627ec
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
7893bcd77e
|
功能菜单国际化 完成
|
6 years ago |
|
jokelone
|
0e9f13ff82
|
【bug：6582报废原因增加报废类型】
|
6 years ago |
|
jokelone
|
e754cb9053
|
【优化：27班组增加产线、班长字段】
|
6 years ago |
|
jokelone
|
8a806815a5
|
【任务：1193qty数量类型更改为Double】
|
6 years ago |
|
jokelone
|
327e4dcd64
|
【优化：27班组增加产线、班长字段】
|
6 years ago |
|
钮海涛
|
5f3f973c3e
|
新增报表接口
|
6 years ago |
|
王杰
|
a41c00f129
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
4146126284
|
【需求：1202，条码补打】
|
6 years ago |
|
jokelone
|
515a3c5dec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
5bc9b9b082
|
【任务：1193字段类型修改】
|
6 years ago |
|
jenkins
|
2f6400dc78
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
f1cfe26378
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
7452d49930
|
【采购收货】
|
6 years ago |
|
王杰
|
dd0304d713
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
7d623560b6
|
【需求：1202，条码补打】
|
6 years ago |
|
jokelone
|
3eda200854
|
【bug：6545类型信息增加枚举】
|
6 years ago |
|
王杰
|
09cf450156
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
ca57c0342a
|
【需求：1202，条码补打】
|
6 years ago |
|
汪云昊
|
f7d6fd4ae1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jenkins
|
ddee8a5215
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
qianhs
|
314aa78336
|
【 采购日程单里的寄售属性选项是0/1，应改为是/否】【bug6369】
|
6 years ago |
|
crish
|
4d3adf5daf
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c39324648e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
04c6946271
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
b2b16e2017
|
安灯工位分组配置
|
6 years ago |
|
汪云昊
|
f0e77305dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
3856a6d600
|
LAC调整微服务指令集操作方式
OPC UA工具订阅方式调整
|
6 years ago |
|
曾贞一
|
07f51040c3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ff1f561b9d
|
消息样式实体类 增加一条
|
6 years ago |
|
1111
|
f0290a758d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
1111
|
e349ab3e9b
|
【采购收货】
|
6 years ago |
|
王杰
|
4f87ec8516
|
解决冲突
|
6 years ago |
|
wei.peng
|
6cb9eeed8c
|
功能权限 倒入导出 添加产品类型校验
|
6 years ago |
|
wei.peng
|
11bc240347
|
功能权限国际完成
|
6 years ago |
|
jokelone
|
07ee1971ae
|
【bug：6522工位增加序号字段】
|
6 years ago |
|
crish
|
54ae351d91
|
安灯任务管理界面查询代码优化， 解决安灯任务， 开发信号发送逻辑
|
6 years ago |
qinjia zou
|
f7c89fa6b1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
qinjia zou
|
c051b6024b
|
【VDA物流路线-路线新增-字段赋值】bug6515
|
6 years ago |
|
jokelone
|
869278c614
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
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 |