wynne1005
|
12f1c4a809
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
708985be2a
|
中航 设备自动报警 #1
|
5 years ago |
 曾贞一
|
2f717fdd98
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
2d2ff0ddb1
|
【2801 武汉PRD-AMP-WMS2SAP回传TWD订单收货结果接口】
|
5 years ago |
joke.wang
|
9fb8962e4e
|
客退件bug修复
|
5 years ago |
宋军超
|
979e18c4a7
|
天津麦格纳修改涂装质检看板
|
5 years ago |
puxiao.liao
|
4bfb903e54
|
修复麦格那发运提交事务重复&盘点提交sql异常
|
5 years ago |
|
宋军超
|
ba6470baad
|
天津麦格纳修改组托获取托包规数量
|
5 years ago |
rock.yu
|
d227fcedd4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
11750e9bf1
|
修改库存快照的pojo，确保快照功能可以正常执行
|
5 years ago |
汪云昊
|
ffdfd866e0
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
b2bc93abfe
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
816557085f
|
fix(base):修改当前页取值方法
|
5 years ago |
|
wynne1005
|
2ae471febd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
3c1c6c8c55
|
新增通用对象 password
|
5 years ago |
陈思洁
|
e9ce24d6f9
|
【2794 09 ext 19081-返工返修标签打印变更-20200813】
|
5 years ago |
|
joke.wang
|
612c919e5f
|
bypass优化
|
5 years ago |
|
puxiao.liao
|
fc351f5599
|
修复TJ MGN BUG
|
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
|
114654dd99
|
冲突解决
|
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
|
16a2d75a17
|
结果生产报工job的sqlserver不兼容问题
|
5 years ago |
|
宋军超
|
0c93ee5877
|
天津麦格纳修改看板和条码补打问题
|
5 years ago |
|
rock.yu
|
409cd02a8d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
352db6a7fa
|
工单拉动的日志保存到数据库
|
5 years ago |
|
joke.wang
|
72502a863b
|
Fix Bug #11490
|
5 years ago |
|
puxiao.liao
|
10edb8ebae
|
Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
|
5 years ago |
 王杰
|
895eb461ab
|
数据复核
|
5 years ago |
|
宋军超
|
95f008a602
|
天津麦格纳添加组装打印托标签功能，修改物料颜色名称从物料表中取问题
|
5 years ago |
|
钮海涛
|
fa467a2e0d
|
sweb合并dev代码
|
5 years ago |
|
钮海涛
|
5f144781c9
|
SWEB合并test代码
|
5 years ago |
|
钮海涛
|
6749bda558
|
合并dev代码
|
5 years ago |
|
钮海涛
|
572e749bdb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
b253a020b9
|
合并test代码
|
5 years ago |
|
puxiao.liao
|
cbc885748a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
2c3571b014
|
修复TJ MGN BUG
|
5 years ago |
|
钮海涛
|
ea875c1a3b
|
SWEB功能开发
|
5 years ago |
|
宋军超
|
998e87b61d
|
天津麦格纳修改过程条码补打
|
5 years ago |
|
puxiao.liao
|
f14cc48243
|
修复TJ MGN BUG
|
5 years ago |
|
songss
|
f2d6552f6b
|
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 |
|
songss
|
20b40ce294
|
添加 中航-DB复核项 枚举
|
5 years ago |
|
宋军超
|
8a392814aa
|
天津麦格纳修改涂装展示组件添加字段展示
|
5 years ago |
|
wynne1005
|
8c0ea0d52f
|
冲突解决
|
5 years ago |
|
wynne1005
|
10d5276fbb
|
过程检测 演示修改
|
5 years ago |
|
puxiao.liao
|
e6b5caa61c
|
修复TJ MGN BUG
|
5 years ago |
|
joke.wang
|
cce1d91650
|
客退备件返修
|
5 years ago |
|
宋军超
|
e18ad44c14
|
天津麦格纳修改返工返修
|
5 years ago |
|
陈思洁
|
21ca0a9d0d
|
【11437 19081-半成品预装队列优化-20200917】
|
5 years ago |
|
陈思洁
|
7029b75f27
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
a9b18733ec
|
【11218 19081-安灯系统增加PLC交互控制三色灯-20200910】
|
5 years ago |
|
钮海涛
|
22e59a3800
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
f9db132861
|
坤泰SWEBU9接口
|
5 years ago |
|
rock.yu
|
17dae82081
|
增加麦格纳工单的滑动窗口计算逻辑
|
5 years ago |
|
陈思洁
|
d6c9e9a061
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
1072b4fd04
|
【半成品预装队列】
|
5 years ago |
|
puxiao.liao
|
5e0c0a4051
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
ae6ffa27f4
|
修复TJ MGN BUG
|
5 years ago |
|
joke.wang
|
ba8022f9ca
|
生产队列明细增加条码字段
|
5 years ago |
|
宋军超
|
f58e07fa33
|
天津麦格纳-添加总装质量检测弹框工步和返工返修接口
|
5 years ago |
|
宋军超
|
ad5c122df8
|
天津麦格纳-添加总装质量检测弹框工步和返工返修接口
|
5 years ago |
|
汪云昊
|
6156207369
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
d19fbe8cf1
|
fix(core):用户信息导出时，用户状态信息为空
|
5 years ago |