 曾贞一
|
35023af12c
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
汪云昊
|
e7d176209e
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
64d83d238f
|
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
b4f14112b3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
袁津哲
|
94f25541aa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
4dc2996bdc
|
业务类型实体中新增是否启用波次字段
|
5 years ago |
宋军超
|
b3032ca8e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
45dda6ea57
|
添加散件配置报文关系和工装明细实体
|
5 years ago |
|
袁津哲
|
cbe3094f2a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
ea9457a191
|
修复WMS波次计划实体类字段
|
5 years ago |
 钮海涛
|
cfd3f8d58f
|
冲突解决
|
5 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
陈思洁
|
30608f886b
|
解决冲突
|
5 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
钮海涛
|
53dc57a03e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
df1cbc9449
|
新增供货追踪接口
|
5 years ago |
qianhs
|
836a4f710d
|
联调测试
|
5 years ago |
|
宋军超
|
b3cecc9481
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
f64a543a4a
|
添加产品流程批量配置功能
|
5 years ago |
|
袁津哲
|
bcec12cb38
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3442fd4801
|
波次规则明细新增开窗查询字段
|
5 years ago |
|
袁津哲
|
9f918b6664
|
修改波次规则和范围枚举类字段值名称
|
5 years ago |
 王杰
|
cd99a63233
|
mes
|
5 years ago |
|
汪云昊
|
0d75c1eac7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
wynne1005
|
032fb350c8
|
queueordermodel添加构造函数
|
5 years ago |
|
曾贞一
|
57f2177ef6
|
【波次合并规则--枚举查询错误】
|
5 years ago |
|
袁津哲
|
ae1c6ef8fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
8a836e340a
|
优化枚举查询报错问题
|
5 years ago |
puxiao.liao
|
d2fb33d888
|
bug1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |
|
puxiao.liao
|
053e81b861
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |
|
曾贞一
|
c0e3f1cb4f
|
【找回文件】
|
5 years ago |
|
曾贞一
|
e84d74d7be
|
【冲突文件找回】
|
5 years ago |
|
王杰
|
5fc4c6c025
|
mes
|
5 years ago |
|
曾贞一
|
c926992611
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
4dae2eea7d
|
【MES 导入】
|
5 years ago |
|
钮海涛
|
52a5c1e2f8
|
Merge branch 'test' into dev
|
5 years ago |
|
qianhs
|
851bd1feec
|
联调测试
|
5 years ago |
|
wynne1005
|
4324457b61
|
merge
|
5 years ago |
|
wynne1005
|
dce52df770
|
组件传参给工步
|
5 years ago |
|
qianhs
|
241ec4974b
|
联调测试
|
5 years ago |
|
wynne1005
|
351ea8755e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
6a36ad7601
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
5 years ago |
|
袁津哲
|
15035d2851
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3529d1b845
|
枚举类修改规则范围和规则值
|
5 years ago |
|
钮海涛
|
8c4cb0748b
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
5 years ago |
zcg
|
83d7a618bf
|
按钮组件model修改
|
5 years ago |
|
zcg
|
9ab0d784dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
qianhs
|
3654d60214
|
【bug7947】PLC监听工步装队列无法显示
|
5 years ago |
|
汪云昊
|
2a80a4c720
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
aeda8d8287
|
版本调整
|
5 years ago |
|
zcg
|
73f647e3b4
|
枚举修改
|
5 years ago |
|
zcg
|
078e1a77a4
|
【bug 7895 PLC信息-页面需修改】
|
5 years ago |
|
puxiao.liao
|
f8405b87d9
|
bug7940【7940 推荐入库-未按最近距离推荐】
|
5 years ago |
|
汪云昊
|
3069c5bf18
|
查询条件补充
|
5 years ago |
|
钮海涛
|
82d5332861
|
修复POM文件问题
|
5 years ago |
|
钮海涛
|
3b987436d8
|
新增LES管理功能
|
5 years ago |
|
钮海涛
|
c3a5564652
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
5 years ago |
|
钮海涛
|
6925ce3b18
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
5 years ago |
|
袁津哲
|
a8d84b1043
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
5de3c0bd7b
|
移库单模型中添加创建时间字段
|
5 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |
joke.wang
|
05991b00d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
1b0d0f8c6b
|
[任务：1576 动态按钮加载]
|
5 years ago |
|
袁津哲
|
a4d32d6612
|
开发波次计划根据规则生成计划功能
|
5 years ago |
|
袁津哲
|
cb8a090aea
|
开发波次计划功能
|
5 years ago |
|
袁津哲
|
ffbd512b89
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
14cfa5fa47
|
创建波次计划规则实体类和规则明细实体类
|
5 years ago |
|
wynne1005
|
d1ff70adc4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
|
zcg
|
75832427e8
|
【task 1539 工位扫描-按钮组件结构搭建】
|
5 years ago |
|
曾贞一
|
bcb8dee045
|
【1558 生产工单管理-泰国需求】
|
5 years ago |
|
wynne1005
|
3c08e7794f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
eed24e0297
|
统一修改pom文件的项目版本问题
|
5 years ago |
|
汪云昊
|
6ed34b9e5f
|
FTP服务端工具
|
5 years ago |
|
汪云昊
|
b8abed43ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
a32d4b3b00
|
资源模块化
资源工具类优化
|
5 years ago |
|
qianhs
|
3b763b45cd
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
joke.wang
|
4cb3d89ad6
|
[bug: 7637 生产数据ees查询修改]
|
5 years ago |
|
wei.peng
|
02b5fc715a
|
添加对象序列化
|
5 years ago |
|
陈思洁
|
ee0c342cac
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
6e1961c9d8
|
【mes_增加工位BOM表中的匹配类型枚举】
|
5 years ago |
|
钮海涛
|
c37809d5b7
|
合并源仓库的修改
|
5 years ago |
|
puxiao.liao
|
9dea4f1206
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
a887aa1236
|
1454 基于责任区域和班次的任务推送
|
5 years ago |
|
wei.peng
|
c8c7c73336
|
自定义报表 布局,元素,报表 功能优化完成
|
5 years ago |
|
钮海涛
|
d98e84759c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
f345ed2b2f
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
286d605f09
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
|
陈思洁
|
f14f26a176
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
5e2c592bbd
|
【IOT测试修改】
|
5 years ago |
|
曾贞一
|
1cf4943751
|
冲突解决
|
5 years ago |
|
曾贞一
|
70ff1763b8
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
|
5 years ago |
|
王杰
|
0502f6d736
|
【任务：1529，料架分组队列展示组件】
|
5 years ago |
|
puxiao.liao
|
bf427bbb31
|
bug7918【7918 条码操作记录表在更新后，缺少一行关联二维码字段，（更新后出现的问题）】
|
5 years ago |