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 |
 钮海涛
|
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 |
|
crish
|
9edfa3d481
|
安灯知识库
|
6 years ago |
 曾贞一
|
e603ac66a7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
4809b8bc83
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
16839f6911
|
成品冲销+抛异常方法封装优化
|
6 years ago |
|
王杰
|
5a036f14cb
|
mes设备作业任务
|
6 years ago |
|
jokelone
|
7fc439319e
|
返厂返修
|
6 years ago |
陆卫豪
|
413266293e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
030391a93c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
56d7457826
|
工位监控提交
|
6 years ago |
|
曾贞一
|
5e7fb00d0c
|
【生产领料】
|
6 years ago |
|
许心洁
|
1f1b4f7511
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
48a6cdc39c
|
作业任务：作业类型 枚举增加
|
6 years ago |
|
crish
|
e260045c42
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
crish
|
97763d6b53
|
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
|
6 years ago |
|
王杰
|
b561110e54
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
9cc89f9397
|
mes设备周期计划
|
6 years ago |
|
许心洁
|
2f843a8f5a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |