joke.wang
|
612c919e5f
|
bypass优化
|
5 years ago |
puxiao.liao
|
fc351f5599
|
修复TJ MGN BUG
|
5 years ago |
songss
|
44af4d1418
|
项目过滤掉.DS_Store
|
5 years ago |
wynne1005
|
7c9c0890fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
songss
|
28d7b79f82
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
777f5818b3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
114654dd99
|
冲突解决
|
5 years ago |
宋双双
|
3d259fe565
|
删除 '.DS_Store'
|
5 years ago |
|
wynne1005
|
696695ef0e
|
海纳川变更 10923 10894
|
5 years ago |
|
songss
|
d050274450
|
新增查询生产表数据接口
|
5 years ago |
陈思洁
|
5fcdc2d4ea
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
053b609d88
|
【11559 19081-MESOP30料箱二次校验没有触发20200922】
|
5 years ago |
汪云昊
|
25c195ba98
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
 钮海涛
|
0ce944ec5f
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
73809df827
|
合并swebtest代码
|
5 years ago |
|
songss
|
2f953ac223
|
新增获取中航DB复核项接口。新增修改生产数据接口
|
5 years ago |
|
joke.wang
|
bc383d573b
|
生产工单增加特殊标示字段
|
5 years ago |
|
钮海涛
|
ac4f217c9d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
c4f161e958
|
Start Task #2795
|
5 years ago |
|
puxiao.liao
|
ffb45cf3dd
|
修复TJ MGN BUG
|
5 years ago |
|
songss
|
90a96444e7
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
c5de9c9841
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
 曾贞一
|
0f4a8c130c
|
【冲突解决】
|
5 years ago |
|
曾贞一
|
41efdd4de8
|
【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】
|
5 years ago |
宋军超
|
61aabc957e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
735838e27f
|
天津麦格纳修改紧急问题
|
5 years ago |
|
汪云昊
|
6ab0f17ac7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
d6f4fa7f92
|
feat(softswitch):添加报文处理状态及处理结果
|
5 years ago |
|
汪云昊
|
673c6d0fe2
|
fix(softswitch):ftp-linux系统中文件读取失败
|
5 years ago |
|
puxiao.liao
|
667d80c37d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
0c044eed91
|
修复TJ MGN BUG
|
5 years ago |
|
钮海涛
|
7b2c49f638
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
0d0905c454
|
sweb合并dev代码
|
5 years ago |
|
puxiao.liao
|
4ffe517015
|
修复TJ MGN BUG
|
5 years ago |
|
宋军超
|
706d0fc43d
|
天津麦格纳问题修改
|
5 years ago |
|
陈思洁
|
550713320f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
d92c669f79
|
【11493 20042 标签条码模版需要显示客户名称 0921】
|
5 years ago |
|
songss
|
f222395015
|
襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据
|
5 years ago |
|
puxiao.liao
|
07f6aabd72
|
修复TJ MGN BUG
|
5 years ago |
|
wynne1005
|
456741c116
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
e7196c3f7f
|
海纳川 10923 10894
|
5 years ago |
 贾文涛
|
8fb9760f82
|
对象引用循环嵌套了，此字段不用就删掉。StationRequestBean->MesStateMachineStatus->StepResult->StationRequestBean
|
5 years ago |
|
贾文涛
|
772f1b9d28
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
232abdafd3
|
10984 组装生产线箱条码批次扫描！-2020-09-01,需求开发
|
5 years ago |
|
宋军超
|
d5e356938e
|
天津麦格纳修改组托打印功能
|
5 years ago |
|
宋军超
|
cdd1f3eaba
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
rock.yu
|
15c302c8e3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
16a2d75a17
|
结果生产报工job的sqlserver不兼容问题
|
5 years ago |
|
宋军超
|
0c93ee5877
|
天津麦格纳修改看板和条码补打问题
|
5 years ago |
|
puxiao.liao
|
d055374613
|
修复生产报工查询SQL异常
|
5 years ago |