wynne1005
|
0fd5989864
|
新增帮助类型的busiType
|
5 years ago |
rock.yu
|
42187ebadc
|
完善流程管家日志信息
|
5 years ago |
 钮海涛
|
0b60a0f290
|
合并dev代码
|
5 years ago |
|
钮海涛
|
85395e84fd
|
合并dev代码
|
5 years ago |
|
钮海涛
|
2013d47353
|
合并dev代码
|
5 years ago |
宋军超
|
940510ea5b
|
北京海纳川、北京麦格纳问题修复
|
5 years ago |
陈思洁
|
d7f8796d36
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ee1b0b5b67
|
【2674 预装区基础页面开发】
|
5 years ago |
puxiao.liao
|
d63d07ad7e
|
麦格纳收货BUG
|
5 years ago |
joke.wang
|
ac55ae1df1
|
库存排程配置增加物料名称
|
5 years ago |
 王杰
|
7a502c45c9
|
注塑上料 展示组件增加字段
|
5 years ago |
|
陈思洁
|
baa7d144b7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
daf0b94314
|
【10828 19048-10827-预装作业界面优化！-2020-08-25】
|
5 years ago |
 曾贞一
|
3f2232d741
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
ec7aee68a7
|
【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】
|
5 years ago |
|
宋军超
|
53d392ebe1
|
海纳川问题修复枪头更换添加弹框校验
|
5 years ago |
|
wynne1005
|
ebd12f7c65
|
去除ProductBiModel重复字段
|
5 years ago |
|
wynne1005
|
f9fa5814f6
|
冲突解决
|
5 years ago |
|
wynne1005
|
40ec96a390
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
bbcd0c8f69
|
去除多余枚举
|
5 years ago |
许心洁
|
2cc6abb902
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
291c0b2a40
|
BUG#10584,BUG#10784,BUG#10785
|
5 years ago |
|
钮海涛
|
9a41c2e2e0
|
合并test到dev
|
5 years ago |
|
宋军超
|
8e288c3427
|
海纳川问题修复
|
5 years ago |
|
宋军超
|
6e23c4681e
|
海纳川问题修复
|
5 years ago |
|
钮海涛
|
025cc19f68
|
合并dev到test
|
5 years ago |
|
钮海涛
|
347f6671f2
|
合并dev到test
|
5 years ago |
|
钮海涛
|
99b8cb146c
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
|
wynne1005
|
3769a630fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
42a340d0c0
|
timeModuleInit
|
5 years ago |
|
宋军超
|
f3cb06ba5a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
030343f2ce
|
海纳川问题修复
|
5 years ago |
|
王杰
|
43ad04818c
|
pom
|
5 years ago |
|
王杰
|
0d256b3afd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
钮海涛
|
b4a4c42fe0
|
合并master代码
|
5 years ago |
|
wynne1005
|
b3aa6eef70
|
中航 均值极差
|
5 years ago |
|
钮海涛
|
35d3a85b60
|
合并master代码
|
5 years ago |
|
钮海涛
|
c7adb56b9c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
汪云昊
|
8d6b01c06e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
钮海涛
|
3df3c89db9
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
汪云昊
|
a52646a65d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
|
5 years ago |
|
钮海涛
|
ea43d63d7e
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
汪云昊
|
dd75e3729b
|
feat:添加条码解析校验模式
|
5 years ago |
|
汪云昊
|
d02c73f431
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
26cf4c5e92
|
feat:mongo模块化
|
5 years ago |
|
汪云昊
|
103137e2fc
|
feat:添加条码解析校验模式
|
5 years ago |
|
汪云昊
|
a5d7ff1ef4
|
feat:添加条码解析校验模式
|
5 years ago |
|
王杰
|
3b31f9fcc8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
d0bfa965f7
|
类型信息 seq
|
5 years ago |