puxiao.liao
1dc9276e9a
BH 需求变更
5 years ago
puxiao.liao
c06fee639d
BH 需求变更
5 years ago
qianhs
17b27da539
BH-CODE 出库,绑定
5 years ago
钮海涛
ad79c9fd7b
修改BH基础数据
5 years ago
qianhs
f4c4b4a1f6
1,产品条码事务实体类提交
5 years ago
钮海涛
b9cbf9684b
Merge branch 'test' into dev
5 years ago
钮海涛
b303cf9a14
修复合并问题
5 years ago
钮海涛
96fdbe0e07
Merge branch 'master' into test
5 years ago
puxiao.liao
491bc32325
Fix Bug#8345
5 years ago
贾文涛
a68475d3d0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
贾文涛
a8efa90089
bug 7461,count时去掉distinct。Fix Bug #7461
5 years ago
袁津哲
cad6b7ad89
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
f50b76cd1f
Task1858:电枪枪头更换计数
5 years ago
wynne1005
608aa6be90
还原pom
5 years ago
wynne1005
99d3c9d721
提测合并 还原pom
5 years ago
wynne1005
6dd2f12a2a
Merge branch 'dev' into test
5 years ago
wynne1005
5ef88c80c0
提测合并 还原pom
5 years ago
王杰
56ae714283
【任务:1845,安灯】
5 years ago
wei.peng
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
wei.peng
9ee8acae91
合并代码 有代码丢失或者文件丢失请排查此处
5 years ago
袁津哲
08b03c9eb8
Task1858:电枪枪头更换计数
5 years ago
joke.wang
e2ce63a9cd
bug: [8533] plc数据类型改为枚举
5 years ago
joke.wang
88a0d6d02f
任务:[1828] 半成品绑定工步增加逻辑
5 years ago
宋军超
1f55c06368
任务:【1842】-海纳川通用导入添加对应工具类、实体和model
5 years ago
袁津哲
6e3da00fda
Task1812:仓库健康度指标视图及相关指标自定义( #476 )
5 years ago
王杰
786c442d55
解决冲突
5 years ago
宋军超
af6b0ce0fd
任务:【1842】-添加海纳川5个基础数据模块的实体与枚举
5 years ago
钮海涛
c1241bd6c5
修复版本问题
5 years ago
钮海涛
53a421b3b9
修复版本问题
5 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
5 years ago
王杰
029763feb1
pom
5 years ago
王杰
30fcf4f23f
pom冲突
5 years ago
王杰
716e1f7df1
Merge branch 'test' into dev
5 years ago
宋军超
912ef81271
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
宋军超
373808e20d
任务:【1928】-添加检测单-检测类型枚举修改code描述
5 years ago
qianhs
8d61db5ed5
任务:1786,1787,1788,1789
5 years ago
汪云昊
717f268c28
POJO版本号还原
5 years ago
钮海涛
281ef662b1
merge test
5 years ago
汪云昊
c27ebee3f9
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
汪云昊
9532489502
POJO添加序列化id
5 years ago
qianhs
c38757de19
盘点
5 years ago
wynne1005
a4551a746a
[优化] 修改DdlPackBean查询 -> 工厂代码可以是英文或中文
5 years ago
宋军超
dfce22d654
任务:【1928】-添加检测单-检测类型枚举
5 years ago
陈思洁
9865558af3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
6fbfea417f
【1804 质检检测-来料检验功能】
5 years ago
汪云昊
e8ea5a3c90
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
汪云昊
d86cdfe4ff
OPC UA 优化
5 years ago
陈思洁
c0f5709bb2
【合并冲突】
5 years ago
陈思洁
aef8841223
【合并冲突】
5 years ago
陈思洁
60973a3ee0
【1804 质检检测-来料检验功能】
5 years ago