 曾贞一
|
913991d30d
|
【2193 06 1.2.3.7.4任务自动生成任务JOB】
|
5 years ago |
陈思洁
|
3f88a390e4
|
【8983 需求调整-泰国MES，工单下达逻辑调整】
|
5 years ago |
 钮海涛
|
d08465dd38
|
修复版本问题
|
5 years ago |
|
钮海涛
|
800a954b7f
|
Merge branch 'test' into dev
|
5 years ago |
joke.wang
|
1f05cfca4c
|
Finish Task #2152 Cost:16h
|
5 years ago |
puxiao.liao
|
9cd0823c34
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
曾贞一
|
9567d62195
|
【自动化策略】
|
5 years ago |
|
puxiao.liao
|
17d3642fff
|
自动化策略主表
|
5 years ago |
|
曾贞一
|
a8b2a0a618
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
e94e4ad189
|
【2180 06 1.2.3.8泰国WMS－生产报工接口】
【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】
【2180 06 1.2.3.8泰国WMS－生产报工接口】
|
5 years ago |
汪云昊
|
6d71c01178
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
陈思洁
|
9e9bb2fd03
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
f90371f632
|
【2144 06 1.2.4.6.1.3 装配计划排产】
|
5 years ago |
|
钮海涛
|
ac7e69e51e
|
修复版本问题
|
5 years ago |
|
钮海涛
|
34e63db56c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
e340749f87
|
Finish Task #2196 Cost:4h
|
5 years ago |
宋军超
|
87dc9ab966
|
与前端联调修改
|
5 years ago |
|
曾贞一
|
16271ea338
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
77e6ee3b98
|
【2180 06 1.2.3.8泰国WMS－生产报工接口】
|
5 years ago |
|
宋军超
|
2ef42fdadd
|
Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h
|
5 years ago |
|
钮海涛
|
9d64793a5f
|
Merge branch 'master' into test
|
5 years ago |
|
joke.wang
|
3dda15e00a
|
Finish Task #2153 Cost:24h
|
5 years ago |
|
puxiao.liao
|
0c0d43cd96
|
北京海纳川：采购入库组件
|
5 years ago |
|
汪云昊
|
3c2462c1af
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
fdd5516a0f
|
FTP适配器优化
表单功能优化
UA 适配 LONG类型
|
5 years ago |
wynne1005
|
878acb869f
|
提交zh修改问题
|
5 years ago |
wei.peng
|
b0e752c65e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wei.peng
|
91f4edc83f
|
数据库读写分离 功能完善
|
5 years ago |
|
wei.peng
|
d5051cabdb
|
数据库读写分离 功能完善
|
5 years ago |
|
wei.peng
|
25b2109144
|
getByProperty 查询优化
|
5 years ago |
 王杰
|
0388c36c41
|
mes
|
5 years ago |
|
wei.peng
|
fb65b042f0
|
getByProperty 查询优化
|
5 years ago |
|
wei.peng
|
ec3febfaa9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
wei.peng
|
bdb5e6e27c
|
密码策略完成
|
5 years ago |
袁津哲
|
638c032d95
|
优化工位定时组件调用逻辑
|
5 years ago |
|
wynne1005
|
8ff96a0c3f
|
merge master 防止冲突更多
|
5 years ago |
|
wynne1005
|
b0b07437d6
|
还原pom
|
5 years ago |
|
汪云昊
|
4ec71681de
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
4de301bf79
|
MDM 系统结构优化
单元测试开关
|
5 years ago |
|
wynne1005
|
9571604351
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
6c47817bfe
|
mes enuk
|
5 years ago |
|
joke.wang
|
6f375edf9a
|
类型信息枚举增加样本类型
|
5 years ago |
|
陈思洁
|
3924be2504
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
e7e13e53f4
|
【工艺流程设计-更新前端组件】
|
5 years ago |
qianhs
|
53298f6b88
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
曾贞一
|
5c2dcf8e10
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
f3857116d1
|
【2074 06 1.2.3.8上架策略-计算COI值】
|
5 years ago |
|
袁津哲
|
764060bf20
|
Start Task #2118 Cost:8h Left:0h
Finish Task #2118 Cost:8h
|
5 years ago |
|
qianhs
|
7a60d37ddc
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
钮海涛
|
aeb347b1fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
ce020cc1ab
|
Start Task #2134 Cost: 8h
|
5 years ago |
|
wynne1005
|
60c1f6ecab
|
还原pom
|
5 years ago |
|
wynne1005
|
47ae0b46ef
|
还原pom
|
5 years ago |
|
wynne1005
|
ba1ba8bc0f
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
8623a5a13d
|
还原pom
|
5 years ago |
|
wynne1005
|
b75347ffc1
|
还原pom
|
5 years ago |
|
wynne1005
|
4eef0f8c45
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
9f349cd42c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
9dd7c54678
|
修复启动问题
|
5 years ago |
|
袁津哲
|
adb974d874
|
合并test分支代码到dev分支
|
5 years ago |
|
wynne1005
|
40d921ddd6
|
优化 新增状态点类型，发运自测1
|
5 years ago |
|
袁津哲
|
0504e58f95
|
Fix Bug #8778
|
5 years ago |
|
王杰
|
1d775acd69
|
ptl IF_拣货数据
|
5 years ago |
|
joke.wang
|
28fe4a03f8
|
Finish Task#2108 Cost:12h
|
5 years ago |
|
钮海涛
|
93dd90363e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
ae805a6596
|
修复Bug
|
5 years ago |
|
袁津哲
|
0067e31420
|
合并test分支代码到dev分支
|
5 years ago |
|
袁津哲
|
a871d65e1f
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
5 years ago |
|
袁津哲
|
0a5f45840a
|
Fix Bug #8778
|
5 years ago |
|
宋军超
|
d18beff50c
|
Finish Task #2094 Cost:16h
|
5 years ago |
|
钮海涛
|
7982cefc1e
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2f8b0ba5db
|
修复版本问题
|
5 years ago |
|
qianhs
|
057439d050
|
Finish Task #2080 Cost:8h
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
|
5 years ago |
|
钮海涛
|
a71d7a31ce
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
471208d051
|
SWEB添加条码状态枚举
|
5 years ago |
|
王杰
|
c39c9b6f70
|
ptl
|
5 years ago |
|
joke.wang
|
1afa60623c
|
Finish Task #2090 Cost:16h
|
5 years ago |
|
汪云昊
|
2f71b79ed8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
79429024cf
|
MDM基础功能
|
5 years ago |
|
汪云昊
|
08c52dc09f
|
文件服务器优化扩展
添加go-fastdfs支持
|
5 years ago |
|
宋军超
|
3c53d8a2f2
|
Finish Task #2064 Cost:24h
|
5 years ago |
|
陈思洁
|
9f6ecf72a0
|
【2002 泰国内饰生产作业-按生产工单，单件生产】
|
5 years ago |
|
joke.wang
|
f357293ca5
|
plc数据类型修改
|
5 years ago |
|
汪云昊
|
e416b032c2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
4fc8c2a80d
|
软适配添加适配发送报文
|
5 years ago |
|
王杰
|
6232d14e61
|
[任务：2066，状态机异常处理]
|
5 years ago |
|
袁津哲
|
7aaa8bca6d
|
合并dev分支代码到test分支
|
5 years ago |
|
puxiao.liao
|
9a65fc95fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
9975335acb
|
Finish Task #2033 Cost:8h
|
5 years ago |
|
袁津哲
|
b0f3873aea
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
a8dd9831e0
|
Start Task #2021,2022 Cost:8h Left:8h
|
5 years ago |
|
曾贞一
|
4c3571182c
|
【冲突】
|
5 years ago |
|
曾贞一
|
523e4b7b3b
|
【2016 BH-回传检测结果至MES系统】
|
5 years ago |
|
wei.peng
|
d753bdc5b6
|
fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源
|
5 years ago |
|
钮海涛
|
7414b76d85
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
32a566be93
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
6061f89d43
|
修复合并版本问题
|
5 years ago |
|
宋军超
|
570be85b8d
|
Fix Bug #8744
|
5 years ago |
|
曾贞一
|
faf8cced03
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
曾贞一
|
4346eb647b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |