宋军超
|
ebb965f46d
|
天津麦格纳添加看板维护接口
|
5 years ago |
Liquor
|
83bfaaceab
|
对SPC-KEY-TATA表的相关接口进行了相关优化。
|
5 years ago |
|
Liquor
|
3d8842602d
|
增加了SPC-KEY-TATA表的相关接口。
|
5 years ago |
puxiao.liao
|
65ea61fd70
|
增加昆泰其它出库业务类型
|
5 years ago |
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
puxiao.liao
|
85feb7927a
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
0f46a23c7a
|
Fix bug#11611
19081-计划外入库-扫描条码后撤销
|
5 years ago |
 钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
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 |
|
汪云昊
|
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 |
joke.wang
|
612c919e5f
|
bypass优化
|
5 years ago |
|
wynne1005
|
114654dd99
|
冲突解决
|
5 years ago |
|
wynne1005
|
696695ef0e
|
海纳川变更 10923 10894
|
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 |
|
joke.wang
|
bc383d573b
|
生产工单增加特殊标示字段
|
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 |
|
汪云昊
|
6ab0f17ac7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
d6f4fa7f92
|
feat(softswitch):添加报文处理状态及处理结果
|
5 years ago |
|
puxiao.liao
|
4ffe517015
|
修复TJ MGN BUG
|
5 years ago |
|
joke.wang
|
72502a863b
|
Fix Bug #11490
|
5 years ago |
 王杰
|
895eb461ab
|
数据复核
|
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 |
|
钮海涛
|
ea875c1a3b
|
SWEB功能开发
|
5 years ago |
|
宋军超
|
998e87b61d
|
天津麦格纳修改过程条码补打
|
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 |
|
wynne1005
|
8c0ea0d52f
|
冲突解决
|
5 years ago |
|
wynne1005
|
10d5276fbb
|
过程检测 演示修改
|
5 years ago |
|
joke.wang
|
cce1d91650
|
客退备件返修
|
5 years ago |
|
puxiao.liao
|
ae6ffa27f4
|
修复TJ MGN BUG
|
5 years ago |
|
陈思洁
|
50c2258f58
|
【增加查询参数条件】
|
5 years ago |
|
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
|
wynne1005
|
3858b2e3d9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
dd1ece9be8
|
新增过程检测 检测结果枚举
|
5 years ago |
|
钮海涛
|
485c66aaf7
|
合并test代码
|
5 years ago |
|
wynne1005
|
531fe743c2
|
过程检测 完成首检判断
|
5 years ago |
|
宋军超
|
6fa35ad939
|
天津麦格纳取消条码补打校验逻辑
|
5 years ago |
|
wynne1005
|
d00dcd80eb
|
冲突解决
|
5 years ago |
|
陈思洁
|
802c801013
|
【11310 19081-下达至下线时间预警-20200913】
|
5 years ago |
|
wynne1005
|
1e9f1a5c47
|
质量检测 1
|
5 years ago |
|
puxiao.liao
|
8ac53abe9e
|
麦格纳ASN新增异常
|
5 years ago |
|
宋军超
|
0d5ade92a9
|
天津麦格纳添加工位缺陷导入功能
|
5 years ago |
|
puxiao.liao
|
9954b1e83a
|
麦格纳ASN新增异常
|
5 years ago |
rock.yu
|
9a2a596094
|
增加条码操作类型-发运校验
|
5 years ago |
|
陈思洁
|
8a1f0c608e
|
【基础页面增加替代料功能】
|
5 years ago |
|
王杰
|
5e229b7176
|
message pool
|
5 years ago |
|
汪云昊
|
1ce2793faa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
799967bde5
|
修改天津麦格纳问题
|
5 years ago |
|
汪云昊
|
7a4be36111
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
156dd53402
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
130d3a9792
|
feat:字典规则调整允许值为空
|
5 years ago |
|
汪云昊
|
ab608c0919
|
feat:用户导出
|
5 years ago |
|
wynne1005
|
9bfd9ef279
|
Merge branch 'master' into test
|
5 years ago |
|
wynne1005
|
beaeccf1ed
|
冲突合并
|
5 years ago |
|
wynne1005
|
48b6634032
|
新增枚举 样本类型
|
5 years ago |
|
宋军超
|
c5ebcaf2b5
|
天津麦格纳添加出入库事务表枚举
|
5 years ago |
|
joke.wang
|
d33dae14dc
|
jsp计算bug优化
|
5 years ago |
|
钮海涛
|
729a7b6990
|
合并冲突
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
d47607880e
|
合并冲突
|
5 years ago |
|
钮海涛
|
56b1ae99a9
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
1b6bbed47c
|
Fix Bug #10974
|
5 years ago |
|
曾贞一
|
5dc142ba34
|
【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】
|
5 years ago |
|
汪云昊
|
0a0727e2fa
|
fix:代码错误
|
5 years ago |
|
汪云昊
|
f878e6b283
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
2e102f4189
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
1ccd4f3b65
|
feat:添加区间查询
|
5 years ago |
|
陈思洁
|
01eda59dd5
|
【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】
|
5 years ago |
|
曾贞一
|
332e37ea94
|
【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】
|
5 years ago |
|
汪云昊
|
6457cac828
|
feat:去除非空校验
|
5 years ago |
|
汪云昊
|
1243607e0e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
cf2bf8d291
|
企业微信适配
|
5 years ago |
|
陈思洁
|
decd0ae558
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6c351c09b5
|
【11016 19048- 总装生产计划显示多条！-2020-09-03】
|
5 years ago |
|
曾贞一
|
8ca16d7c68
|
【枚举状态】
|
5 years ago |
许心洁
|
7f11e5b1d7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
1fe5b807c6
|
BUG#10826,11025,11024
|
5 years ago |
|
puxiao.liao
|
df4e794a48
|
修复MGN系列BUG
|
5 years ago |
|
songss
|
7243e20cc8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
d5d6f2cfee
|
修改枚举值
|
5 years ago |
|
joke.wang
|
18ca368f3c
|
照片采集
|
5 years ago |
|
汪云昊
|
b2517a11b8
|
feat(用户登录日志):用户登录日志查询及导出功能
|
5 years ago |
|
陈思洁
|
564fdb261b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
03730fe13c
|
【[#2702::07 ext 虚拟工单关闭按钮（注塑、涂装、组装） ] 】
|
5 years ago |
|
wynne1005
|
191220442f
|
websocket错误提示音
|
5 years ago |