 钮海涛
|
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 |
|
陈思洁
|
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 |
wynne1005
|
40ec96a390
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
bbcd0c8f69
|
去除多余枚举
|
5 years ago |
|
钮海涛
|
9a41c2e2e0
|
合并test到dev
|
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 |
|
钮海涛
|
b4a4c42fe0
|
合并master代码
|
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 |
|
汪云昊
|
26cf4c5e92
|
feat:mongo模块化
|
5 years ago |
|
汪云昊
|
103137e2fc
|
feat:添加条码解析校验模式
|
5 years ago |
|
wynne1005
|
c3f30530a8
|
erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
086c78f828
|
新增pcn页面的辅助展示组件
|
5 years ago |
joke.wang
|
e3146c9fb4
|
Fix Bug #0776
|
5 years ago |
|
puxiao.liao
|
ba5befe291
|
Finish Task #2645 Cost:8h
【PCR-20200525-003_委外出库条码变更】中的零件号转化
|
5 years ago |
|
joke.wang
|
84dcf36c86
|
Fix Bug #10708
|
5 years ago |
rock.yu
|
5bfd542402
|
增加工单拉动
|
5 years ago |
 曾贞一
|
fe2017fbe4
|
【622 08 1.2.2.2.6 BOM增加虚阶零件】
|
5 years ago |
|
wynne1005
|
a400bf5aa7
|
还原orderBy
|
5 years ago |
|
wynne1005
|
887e1d04f7
|
baseBean sortParamMap 先注释
|
5 years ago |
|
钮海涛
|
9878547daa
|
合并dev分支代码
|
5 years ago |
|
钮海涛
|
272c92dcb6
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
f42ece4f6c
|
优化流程管家执行性能
|
5 years ago |
|
wynne1005
|
a751d5a8a7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
8d7b0fae6a
|
添加小枪日志 与不需要打枪绑定 自动跳过
|
5 years ago |
|
钮海涛
|
ad4b59a700
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
汪云昊
|
2013ca569a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
a45d1ed104
|
fix:分页结束行计算错误的问题
|
5 years ago |
|
wynne1005
|
0d3a8a3af7
|
添加放行记录
|
5 years ago |
许心洁
|
c0629d52d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
1c02cd6562
|
任务#2612，2613
|
5 years ago |
|
wynne1005
|
ba558d640e
|
tmp
|
5 years ago |
|
陈思洁
|
3baf748329
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
9b9871534a
|
【10493 19048-产品颜色无导入功能】
|
5 years ago |
|
汪云昊
|
bda160ccec
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
8d17cfcec0
|
feat:用户定制化配置功能
|
5 years ago |
|
钮海涛
|
54b0af00cc
|
Sweb功能开发
|
5 years ago |