 贾文涛
|
1ffebd418f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
834e3d211d
|
更新查询大于0的业务时，基础类错误问题。
|
5 years ago |
puxiao.liao
|
ee700ab5b0
|
天津麦格纳多级BOM
|
5 years ago |
wynne1005
|
a86a58fa6d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
75520519de
|
修复天津麦格纳BUG
|
5 years ago |
joke.wang
|
233853e1e6
|
库存排程
|
5 years ago |
|
puxiao.liao
|
502427845e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
cfd0cb03ff
|
天津麦格纳BUG修复
|
5 years ago |
 王杰
|
f58d97fb83
|
11777 19048-绑定关键件 绑定多个关键件数据出现回滚-20201012
|
5 years ago |
|
wynne1005
|
248c8229ff
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
a49ddc004c
|
添加lob
|
5 years ago |
rock.yu
|
7b8038d516
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
rock.yu
|
8932108cd3
|
暂时去掉乐观锁
|
5 years ago |
|
puxiao.liao
|
2689495372
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
7027f515e4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
rock.yu
|
df9474807c
|
库存条码表、库存表 增加版本号，用乐观锁控制并发问题
|
5 years ago |
|
puxiao.liao
|
6d64c61848
|
修改FIFO推荐查询逻辑
|
5 years ago |
|
贾文涛
|
0c34bce623
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
2cdb6af2f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
7e24f4ed4a
|
修复队列乱跳问题。
|
5 years ago |
|
贾文涛
|
d2f9c3502a
|
修复队列乱跳问题。
|
5 years ago |
|
wynne1005
|
18275c8fb2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
226c31878a
|
添加缺陷代码
|
5 years ago |
汪云昊
|
5d7397aa4e
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
ee3f9415a7
|
fix(core):组织，部门代码无唯一校验
|
5 years ago |
陈思洁
|
30f8e332fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
8f060d4aa4
|
【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】
|
5 years ago |
 钮海涛
|
bcf0d45000
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
445821b803
|
sweb问题修复
|
5 years ago |
|
puxiao.liao
|
08687a7e14
|
修复天津麦格纳BUG
|
5 years ago |
|
joke.wang
|
c442845f94
|
跳序变更
|
5 years ago |
|
汪云昊
|
911f96b60d
|
style(softswitch):调整代码样式
|
5 years ago |
|
wynne1005
|
95646d6317
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
2b6ff6498c
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
b186af893c
|
feat(softswitch):ftp适配信息优化
|
5 years ago |
|
汪云昊
|
05f493b80e
|
feat(softswitch):添加重试功能
|
5 years ago |
|
wynne1005
|
7fb7db3cb5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
629e6af9a9
|
设备指导操作文件
|
5 years ago |
songss
|
9c1965ea6c
|
11653 19073 安灯导入模板调整
|
5 years ago |
|
puxiao.liao
|
7508796daa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
44b5635e78
|
天津麦格纳PO生产任务增加关联行号
|
5 years ago |
|
钮海涛
|
01d67fdd1f
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
7a29b85848
|
Fix Bug #11733 新增采购订货进度可以编辑原因
|
5 years ago |
宋军超
|
4b65842d6f
|
修改天津麦格纳项目问题
|
5 years ago |
|
wynne1005
|
6750da1d37
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
ebf0392057
|
去除多余optionType枚举
|
5 years ago |
|
puxiao.liao
|
6a42b517fc
|
Fix Task#2839
武汉PRD-WMS&TMS装车明细接口
|
5 years ago |
|
wynne1005
|
470775b527
|
备件生成冲突解决
|
5 years ago |
|
wynne1005
|
f52f07fe77
|
备件导入
|
5 years ago |
|
puxiao.liao
|
c7e5524a0a
|
修复无条码生产扣减增加扣减条码状态只能为入库，合格
|
5 years ago |
|
汪云昊
|
e97a1193e1
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
27088d2db5
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
e97369585d
|
fix(core):在用户未登录时国际化无效
|
5 years ago |
|
王杰
|
1dbb826235
|
19048-喷涂工单下发后未给打印状态赋值-20201012
|
5 years ago |
|
陈思洁
|
e07829e4ea
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
33c59cf39e
|
【11654 MES管理端基础数据模块缺少导入功能 0928】
|
5 years ago |
|
王杰
|
6f3f06a8f6
|
19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012
|
5 years ago |
|
wynne1005
|
d36a7527a6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
c117515b69
|
设备自动报警
|
5 years ago |
|
陈思洁
|
82ae09d2a8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
陈思洁
|
a3100a71e5
|
【9666 19073-安灯报表：工位统计报表-删除班次、设备。添加故障时长-20200721】
|
5 years ago |
|
钮海涛
|
3d5729e28b
|
自动打印队列增加供应商
|
5 years ago |
|
puxiao.liao
|
90d94f35c8
|
Fix bug#11683
质检单-已收货数量-显示优化
|
5 years ago |
|
钮海涛
|
e628fea5a6
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
5a0178f5df
|
合并dev代码
|
5 years ago |
|
songss
|
a5b81cb676
|
解决代码冲突
|
5 years ago |
|
songss
|
966ed3536b
|
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 |
|
songss
|
5816f275bf
|
新增控制计划相关接口
|
5 years ago |
|
钮海涛
|
af4bb83f85
|
sweb合并test代码
|
5 years ago |
|
钮海涛
|
401e38203a
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
5515f25b79
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
c202fa073b
|
修改sweb问题
|
5 years ago |
|
钮海涛
|
1695d75ff2
|
合并dev代码
|
5 years ago |
|
钮海涛
|
94568777fb
|
合并test代码
|
5 years ago |
|
钮海涛
|
9c7d455998
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
55dfff206f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
61ad20717b
|
合并sweb代码
|
5 years ago |
 曾贞一
|
944b853862
|
【代码优化】
|
5 years ago |
|
曾贞一
|
84d5f84457
|
【11629 20021--北美看板需求变更--0930】
|
5 years ago |
|
陈思洁
|
3d8d27d780
|
【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】
|
5 years ago |
|
puxiao.liao
|
79baaa4546
|
Fix bug#11661
移库单界面增加来源存储区和目标库位的检索条件
|
5 years ago |
|
puxiao.liao
|
5033c8dde0
|
Fix bug#11661
移库单界面增加来源存储区和目标库位的检索条件
|
5 years ago |
|
wynne1005
|
814d22fe09
|
设备报警 mes端完成
|
5 years ago |
|
songss
|
e585dce910
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
037e898cd2
|
新增控制计划相关接口
|
5 years ago |
|
汪云昊
|
604b8821eb
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
815daba16d
|
feat(softswitch):ftp适配记录按文件名查询
|
5 years ago |
|
汪云昊
|
21f77a0e7b
|
fix(softswitch):ftp适配器并发读取文件重复
|
5 years ago |
|
宋军超
|
aa01153c4b
|
天津麦格纳更新看板子菜单pojo
|
5 years ago |
|
宋军超
|
461780e0d0
|
天津麦格纳修改看板类型枚举
|
5 years ago |
|
宋军超
|
ebb965f46d
|
天津麦格纳添加看板维护接口
|
5 years ago |
Liquor
|
83bfaaceab
|
对SPC-KEY-TATA表的相关接口进行了相关优化。
|
5 years ago |
|
汪云昊
|
0d20685a55
|
fix(softswitch):ftp适配器并发读取文件重复
|
5 years ago |
|
贾文涛
|
72faca1092
|
添加索引
|
5 years ago |
|
宋军超
|
2bd7650d48
|
天津麦格纳pojo中所有Double类型字段添加注解
|
5 years ago |
|
Liquor
|
3d8842602d
|
增加了SPC-KEY-TATA表的相关接口。
|
5 years ago |
|
puxiao.liao
|
65ea61fd70
|
增加昆泰其它出库业务类型
|
5 years ago |
|
wynne1005
|
8129ca5bee
|
设备报警 mes端完成
|
5 years ago |
|
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
e11e833309
|
refactor(opcua):调整pojo位置
|
5 years ago |
|
puxiao.liao
|
76725167f7
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
f591139bed
|
修复TJ MGN BUG
|
5 years ago |
|
joke.wang
|
f2177fdc1e
|
bypass数据采集bug修复
|
5 years ago |
|
puxiao.liao
|
85feb7927a
|
修复TJ MGN BUG
|
5 years ago |
|
rock.yu
|
68a079fa69
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
rock.yu
|
14d2af59d6
|
增加多级BOM生效功能
|
5 years ago |
|
王杰
|
d548660354
|
连续扫描
|
5 years ago |
许心洁
|
a939c689f3
|
任务#2814
|
5 years ago |
|
joke.wang
|
d9d7e47ca7
|
生产队列明细唯一索引修改
|
5 years ago |
|
songss
|
36df78c9b4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
8c633f0bc3
|
优化字段命名规范
|
5 years ago |
|
puxiao.liao
|
0f46a23c7a
|
Fix bug#11611
19081-计划外入库-扫描条码后撤销
|
5 years ago |
|
rock.yu
|
605b7e846a
|
增加虚零件属性
|
5 years ago |
|
陈思洁
|
d5d4942eb6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
604c1443ca
|
【三色灯控制信息基础页面增删改查】
|
5 years ago |
|
wynne1005
|
ea6fc313c3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
1975906ee5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
4bd47e64c3
|
【接口映射-添加字段接口名称】
|
5 years ago |
|
songss
|
d7edc3a309
|
增加产品数据校验记录报表接口
|
5 years ago |
|
陈思洁
|
0f1f437a9e
|
【2794 09 ext 19081-返工返修标签打印变更-20200813】
|
5 years ago |
|
钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
|
陈思洁
|
373e5026c5
|
【2794 09 ext 19081-返工返修标签打印变更-20200813】
|
5 years ago |
|
陈思洁
|
ad2f084287
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
b8e34a34b5
|
【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】
|
5 years ago |
|
songss
|
b376450d4b
|
修改获取复核异常的数据接口返回数据
|
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 |
|
曾贞一
|
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 |