Dominic_Xiao
|
7bb60b8f6e
|
新增卡斯马三个基础模块的查询条件封装
|
5 years ago |
|
Dominic_Xiao
|
7bb8c5cb35
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
07cd3de33f
|
新增容器位置编号字段
|
5 years ago |
puxiao.liao
|
7ec1bc61b0
|
天津麦格纳看板BUG修复
|
5 years ago |
simon
|
a6064a9a19
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
755d66dbce
|
中航-停线时根据工单删除当前“巡检项生成明细表”
|
5 years ago |
|
puxiao.liao
|
71e70e9a94
|
天津麦格纳看板BUG修复
|
5 years ago |
rock.yu
|
510845c185
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
d41d14b112
|
增加 erp doc no 字段
|
5 years ago |
许心洁
|
97341bab27
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
7dba4e7f32
|
BUG#12166
|
5 years ago |
|
许心洁
|
4d5ffce7ac
|
任务#2933
|
5 years ago |
汪云昊
|
f2a6ddd55a
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
426a6f2026
|
feat(ftp):ftp重试功能
|
5 years ago |
陈思洁
|
2911abf193
|
【12324 20027-PCN端-工单管理-产线管控已经停线，但是在工单管理中点击暂停无法成功提示“90003:工单【1545】需要在停线时才允许暂停[请检查]”-20201109】
|
5 years ago |
宋军超
|
5568a8fa47
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
39da900ae1
|
添加天津涂装看板
|
5 years ago |
|
汪云昊
|
7a6137a667
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
26e1b39119
|
feat(core):邮件支持附件发送
|
5 years ago |
|
宋军超
|
12074e24a8
|
添加天津涂装看板
|
5 years ago |
wynne1005
|
5070fcc8fb
|
天津看板 员工矩阵model 新增领导
|
5 years ago |
|
宋军超
|
e19d53de4a
|
添加天津涂装看板
|
5 years ago |
|
宋军超
|
9aeecbac39
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
98fa35c8a0
|
添加天津涂装看板
|
5 years ago |
|
puxiao.liao
|
679ef67457
|
天津麦格纳看板BUG修复
|
5 years ago |
Aisiyu
|
79161c6703
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
303fe5907d
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
rock.yu
|
7162664b79
|
通用接口增加SID记录
|
5 years ago |
|
rock.yu
|
bc3e94923f
|
增加数据源的类型
|
5 years ago |
|
Aisiyu
|
a2a4a85312
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
1680314d49
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
puxiao.liao
|
274191aee2
|
天津麦格纳看板BUG修复
|
5 years ago |
|
许心洁
|
82dc8eafbb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
3a5e446e90
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
b318abb4b8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
77d8aa4bdd
|
修改天津工单拉动逻辑
|
5 years ago |
|
Aisiyu
|
2ca398468f
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
许心洁
|
29a5d01620
|
BUG#2938
|
5 years ago |
|
puxiao.liao
|
c0d52b93f7
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
cd2076d66a
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
08011a5722
|
天津麦格纳看板BUG修复
|
5 years ago |
joke.wang
|
ae1bb43764
|
mgn-bj edi删除多余项
|
5 years ago |
|
Aisiyu
|
128f97c88b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
0ea3354b70
|
[1211 天津麦格纳货运看板和asn看板时间和count ]
|
5 years ago |
|
宋军超
|
6aeb6bddde
|
添加天津涂装看板
|
5 years ago |
|
汪云昊
|
8d66424bf6
|
fix(form):分页错误
|
5 years ago |
|
汪云昊
|
2121124f4b
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
faf9bd4b14
|
fix(form):分页失效
|
5 years ago |
|
汪云昊
|
3b1c068290
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
eb9e520d76
|
fix(form):分页失效
|
5 years ago |
|
puxiao.liao
|
85d2f03b55
|
修复麦格纳BUG
|
5 years ago |
|
陈思洁
|
a9e8b7b010
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0be2231995
|
【12238 19073-安灯报表-通知记录-工作中心查询条件失效】
|
5 years ago |
 王杰
|
e775db87fa
|
紧急插单
|
5 years ago |
|
wynne1005
|
9e204224f0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
48c1d2c1c8
|
feat(tj) 文件上传
|
5 years ago |
|
许心洁
|
d1fb133839
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
346a5088ff
|
BUG#12231
|
5 years ago |
|
Aisiyu
|
d1c0a6ce8d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
d819821234
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
宋军超
|
9bf8018ac1
|
添加天津涂装看板
|
5 years ago |
|
宋军超
|
06c3992b98
|
添加天津涂装看板
|
5 years ago |
|
Aisiyu
|
be7f6a4a92
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
陈思洁
|
26f075233e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
48a678cc16
|
【12116 19048-工位监控-参数中选择插入条码，依旧提示过程条码在系统中不存在-20201030】
|
5 years ago |
|
宋军超
|
2f81a0f35d
|
添加天津涂装看板
|
5 years ago |
|
puxiao.liao
|
67419496cb
|
修复天津麦格纳BUG
|
5 years ago |
|
陈思洁
|
250d2fbf14
|
【2932 11 2.3.3QMES产品追溯报表】
|
5 years ago |
|
wynne1005
|
8a648eab74
|
新增mysql连接时区
|
5 years ago |
|
simon
|
ece1ca4c01
|
调整中航看板返回，修复中航pcn原材料上线bug
|
5 years ago |
|
王杰
|
b9fef07d7f
|
总装质量判定
|
5 years ago |
|
王杰
|
12224ed8df
|
工单表加索引 ：workCenterCode workOrderStatus
|
5 years ago |
|
wynne1005
|
c118aac425
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
a2cf356516
|
修改mysql驱动版本 兼容mysql8
|
5 years ago |
|
王杰
|
46c22020bd
|
总装 质量判定缺陷增加类型代码
|
5 years ago |
|
陈思洁
|
1ab0225f9c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
c0abb5f994
|
【12077 19048-注塑，喷涂，组装计划生产报表导出无扩展字段内容-20201026】
|
5 years ago |
|
Aisiyu
|
6b9fcb2da9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
ab0b8a2af1
|
[1211 天津麦格纳货运看板sql 修改 ]
|
5 years ago |
|
汪云昊
|
1825cfbdf3
|
revert(pojo):还原pom版本
|
5 years ago |
|
puxiao.liao
|
a844a4d59b
|
天津麦格纳修复BUG
|
5 years ago |
|
wynne1005
|
88c942f509
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
fb5df5aedf
|
照片采集完成
|
5 years ago |
|
joke.wang
|
f38e41f1ec
|
增加看板类型
|
5 years ago |
|
宋军超
|
52c35877d8
|
添加天津涂装报表
|
5 years ago |
|
Aisiyu
|
fd08cfd883
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
28dd76f30b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
11748bb19e
|
【12066 19048-喷涂展示组件颜色查询方式变更-20201024】
|
5 years ago |
|
Aisiyu
|
219dd0ddd7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
47f464b01d
|
[1211 天津麦格纳货运看板 ]
|
5 years ago |
 曾贞一
|
143e2f1947
|
【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】
|
5 years ago |
|
puxiao.liao
|
23537e76e5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
e68735be83
|
MOVE_SN 增加 left_code 属性
|
5 years ago |
|
王杰
|
ade2d60849
|
总装 质量判定
|
5 years ago |
|
王杰
|
d7092a7f52
|
总装标记不良
|
5 years ago |
|
宋军超
|
5d41023df6
|
修改天津涂装看板
|
5 years ago |
songss
|
532e99eb8b
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
76a0703bac
|
调整中航看板接口地址
|
5 years ago |
|
joke.wang
|
0d12d01ebf
|
生产报功表增加分组标识
|
5 years ago |
|
wynne1005
|
ff45755577
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2ff6eded6e
|
修改Oee
|
5 years ago |
|
许心洁
|
08125e3b0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
c9b4b37c23
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
687de9d828
|
feat(form):支持存储过程参数
|
5 years ago |
|
汪云昊
|
e87740e723
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
f47b699146
|
feat(form):支持存储过程参数
|
5 years ago |
|
曾贞一
|
4ee1875097
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
8d91675109
|
【12155 20145+系统参数页面，参数编码也支持模糊查询】
|
5 years ago |
|
puxiao.liao
|
e6e5982d73
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
joke.wang
|
63b7162932
|
mgn-bj 半成品看板
|
5 years ago |
|
汪云昊
|
dceb9b17a5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
91f68d50d4
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
91b1a67f30
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
eb03280b2d
|
doc(sql):getStringLikePack方法标记不推荐
|
5 years ago |
|
汪云昊
|
f1ab018d85
|
feat(softswitch):重试功能
|
5 years ago |
|
曾贞一
|
b979a9471c
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
Aisiyu
|
3b5cd84e6e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
曾贞一
|
e55e8b6f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
5e8b023fd5
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
762f9d4a9b
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
Aisiyu
|
8b94991408
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
2db034a7f8
|
[1211 天津麦格纳WMS-ASN到货看板 ]
|
5 years ago |
|
宋军超
|
692cd283f7
|
添加天津涂装看板-设备实时监控
|
5 years ago |
|
puxiao.liao
|
6269ee358c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2bc15b56ea
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
d8e5aa44bc
|
pom.xml
|
5 years ago |
|
许心洁
|
92fec185b8
|
任务#28142909
|
5 years ago |
|
陈思洁
|
8dfcb7f429
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
3dc951c34f
|
【11964 19048-喷涂抛光报表变更-20201021】
|
5 years ago |
|
曾贞一
|
9a350912ea
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
|
5 years ago |
|
曾贞一
|
5487c165ff
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
87611856dd
|
天津麦格纳多级BOM
|
5 years ago |
|
宋军超
|
37c95dc6b3
|
添加天津涂装看板
|
5 years ago |
|
wynne1005
|
20ee1215d2
|
解决 包名细化 导致冲突
|
5 years ago |
|
wynne1005
|
9d81ec30d1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6d4e8608c4
|
注塑 组装报表开发完毕
|
5 years ago |
|
rock.yu
|
104fa0efa5
|
完成ERP库存差异报表
|
5 years ago |
|
joke.wang
|
f57f4e25be
|
mgn-bj 总屏看板
|
5 years ago |
|
汪云昊
|
a9520cecf7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
31cdda5b33
|
feat(softswitch):适配记录,FTP文件支持SID
|
5 years ago |
|
曾贞一
|
c9378a7d8c
|
【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】
|
5 years ago |
|
许心洁
|
38ddd82ef9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
d7bad41b29
|
天津麦格纳BUG#12111，12110，12108，12105
|
5 years ago |
|
Dominic_Xiao
|
df35a22aac
|
解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
5e1d0a75c9
|
解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
4684466e7e
|
解决BUG:19048-班次时间显示异常:修改查询的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
f57be38c2b
|
解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句
|
5 years ago |
|
puxiao.liao
|
760307910a
|
天津MGN系列BUG修复
|
5 years ago |
|
宋军超
|
1b6264e80d
|
添加天津涂装看板
|
5 years ago |
|
rock.yu
|
0fb04b8370
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |