 曾贞一
|
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 |
汪云昊
|
6e9263e203
|
Merge remote-tracking branch 'remotes/origin/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 |