许心洁
|
c04895784a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
joke.wang
|
c679e7f19b
|
半成品看板优化
|
5 years ago |
|
许心洁
|
a604e70771
|
BUG#12711
|
5 years ago |
|
许心洁
|
3ebcfd21e7
|
BUG#12711,12509
|
5 years ago |
 王杰
|
cf9d3d9f2d
|
tz 看板
|
5 years ago |
puxiao.liao
|
21cfe5c740
|
Fix bug#12004
19058-KT其他出库用例
|
5 years ago |
rock.yu
|
70f659593b
|
通用接口增加 cron 表达式的支持
|
5 years ago |
|
许心洁
|
be272fd12e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2d47eeb84d
|
BUG#12487
|
5 years ago |
 钮海涛
|
12edbb64d5
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
6fe792f75b
|
posn新增供应商生产批次字段
|
5 years ago |
|
钮海涛
|
3bad341970
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
5cea79571b
|
PO订单查看按创建时间倒叙排序
|
5 years ago |
|
许心洁
|
49fb55bb42
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
66de2c1cbb
|
任务#2965
|
5 years ago |
|
joke.wang
|
f6260cec39
|
看板产线基础页面
|
5 years ago |
陈思洁
|
22ec710d78
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
陈思洁
|
4311fef1a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
be8d655eb9
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
王杰
|
a5935b59eb
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
a6ca2b35d3
|
修复北京特殊领料
|
5 years ago |
|
puxiao.liao
|
5f73b892ba
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
81543e3697
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
4392b513f7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
4757408a3b
|
任务#2965
|
5 years ago |
|
王杰
|
59f916ddab
|
produceSn
|
5 years ago |
|
钮海涛
|
7381ac2ca0
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
bf51e5bb7a
|
修改登录平台为固定密码
|
5 years ago |
|
puxiao.liao
|
d4eef85177
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
0fee0dbe67
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6c04caf728
|
【天津看板问题修复】
|
5 years ago |
|
puxiao.liao
|
d153205ead
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
simon
|
5b2bbf7b1e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
c03446866a
|
中航-首检单历史记录显示与修改
|
5 years ago |
|
puxiao.liao
|
9d7ae4a90f
|
修复北京特殊领料
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
钮海涛
|
4ec6267b4e
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
f63813d66d
|
合并master代码
|
5 years ago |
|
钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
joke.wang
|
0009db6b33
|
工位技能查询bug修复
|
5 years ago |
|
joke.wang
|
7a33df666b
|
JSA JSP表增加索引
|
5 years ago |
|
joke.wang
|
148ef03e78
|
看板产线员工能力矩阵
|
5 years ago |
|
puxiao.liao
|
e250883f22
|
Fix bug#12004
19058-KT其他出库用例
|
5 years ago |
|
王杰
|
e2d6b573f0
|
不良记录报表 报工报表
|
5 years ago |
|
王杰
|
3636b75780
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
e21e49ae93
|
不良处理增加展示字段
|
5 years ago |
|
simon
|
0b68fdbee3
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
joke.wang
|
445f6b309c
|
备件消耗替代增加查询字段
|
5 years ago |
Dominic_Xiao
|
8e3943b306
|
Merge remote-tracking branch 'remotes/origin/test' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java
|
5 years ago |
|
王杰
|
c615475dee
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
simon
|
52974a9633
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
d3bcf1499e
|
去掉新增字段非空校验
|
5 years ago |
|
许心洁
|
0f5ab7b144
|
BUG#12609
|
5 years ago |
|
Dominic_Xiao
|
183d976c38
|
新增卡斯马展示组件模型
|
5 years ago |
|
Dominic_Xiao
|
27d76d86ae
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
a0776b7401
|
更新卡斯马展示组件,新增展示组件模型
|
5 years ago |
|
许心洁
|
79ee6eb901
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
359e085aac
|
BUG#12430
|
5 years ago |
|
陈思洁
|
92b395ad3f
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
88376bb350
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
ddc00a617b
|
【冲突】
|
5 years ago |
|
陈思洁
|
2de0d76af3
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
许心洁
|
063ba20f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
8e5c2f4b00
|
BUG#12170,12417,12166,12437,12452
|
5 years ago |
|
王杰
|
08fc0b54c6
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
22411fa928
|
备件导入增加列
|
5 years ago |
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
378205ef61
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
8f899f2f46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
王杰
|
b7e2ddd2c2
|
包装明细 增加索引
|
5 years ago |
|
simon
|
faad8cf4c8
|
修复取消必填字段
|
5 years ago |
|
汪云昊
|
fdec58c92a
|
feat(form):表单导入功能支持
|
5 years ago |
|
钮海涛
|
4dd875a691
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
156b515497
|
修复SWEB问题
|
5 years ago |
|
joke.wang
|
1f306924e4
|
看板自定义参数页面
|
5 years ago |
宋双双
|
42feb06058
|
删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'
|
5 years ago |
|
simon
|
d8409c5b57
|
修改文件格式
|
5 years ago |
|
Dominic_Xiao
|
22a88a4dc0
|
卡斯马定时同步实体类
|
5 years ago |
|
Dominic_Xiao
|
452024abf6
|
删除多余类
|
5 years ago |
|
Dominic_Xiao
|
13bd15d997
|
回滚PCN实体类
|
5 years ago |
|
Dominic_Xiao
|
d8c52a0534
|
新增导包
|
5 years ago |
|
Dominic_Xiao
|
f551ede492
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
Dominic_Xiao
|
61638c391a
|
包装详情表新增容器位置字段
|
5 years ago |
|
Dominic_Xiao
|
785e8dbfe8
|
包装详情表新增容器位置字段
|
5 years ago |
|
Dominic_Xiao
|
f1fedb53f4
|
增加卡斯马业务pojo
|
5 years ago |
|
Dominic_Xiao
|
eb7ed898df
|
增加卡斯马业务pojo
|
5 years ago |
|
Dominic_Xiao
|
8d0e2b942b
|
增加卡斯马业务pojo
|
5 years ago |
|
钮海涛
|
e9ec997e05
|
Fix Bug #12413 查询库存条码错误
|
5 years ago |
|
puxiao.liao
|
dc3e344f11
|
Fix bug#12401
19048-发运单支持关联多个470单据号
|
5 years ago |
|
Dominic_Xiao
|
e919987d68
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
simon
|
7d451dc136
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
joke.wang
|
928c643031
|
看板自定义参数
|
5 years ago |
|
许心洁
|
4300201f99
|
BUG#12430,12495
|
5 years ago |
|
simon
|
4c1add6ba4
|
修改中文描述
|
5 years ago |
|
许心洁
|
a5c78ae005
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
cbd0b1f136
|
BUG#12496
|
5 years ago |
|
王杰
|
fa01ec478a
|
Mes_Package 表加索引
|
5 years ago |
|
许心洁
|
e59f67e84b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
钮海涛
|
1842d1de7c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
e3e4e1fc84
|
修复坤泰问题
|
5 years ago |
|
joke.wang
|
058bd05b4a
|
mgn-bj esop展示组件优化
|
5 years ago |
|
陈思洁
|
14f9dbed22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
c6a3428cbe
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
12391 19048-条码补打(包装)增加关联批次查询条件-20201112
开线管控问题
|
5 years ago |
|
许心洁
|
ecdc5888a4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
e5aefee838
|
BUG#12166
|
5 years ago |
|
Dominic_Xiao
|
de51b68790
|
新增表:产品缺陷位置
|
5 years ago |
|
Dominic_Xiao
|
395039e901
|
新增三个字段
|
5 years ago |
|
Dominic_Xiao
|
31a1c64f69
|
新增字段:缺陷位置代码
|
5 years ago |
宋军超
|
84986eb644
|
添加天津报工报表
|
5 years ago |
|
simon
|
cea2d334e3
|
中航-修复公差上线和公差下线赋值问题
|
5 years ago |
|
Dominic_Xiao
|
ea1d51f32c
|
删除无用类
|
5 years ago |
|
Dominic_Xiao
|
5780306e94
|
增加序列化
|
5 years ago |
|
汪云昊
|
3af9790a9e
|
refactor(impp):调整描述注解
|
5 years ago |
|
汪云昊
|
206e5f8d20
|
feat(form):支持导入数据
|
5 years ago |
|
puxiao.liao
|
89bf22521a
|
Fix bug#12380
19048-支持批量下发BOM的功能
|
5 years ago |
|
王杰
|
86998e109e
|
总装 质量判定
|
5 years ago |
|
puxiao.liao
|
5f6a7c9a98
|
Fix bug#12380
19048-支持批量下发BOM的功能
|
5 years ago |
|
陈思洁
|
ad70d8f1a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
fddd66796b
|
【12276 20027-PCN端 - 巡检检验- 系统生成巡检任务单时没有按照通知计划里面维护的时间去生成巡检任务 -20201105】
|
5 years ago |
|
宋军超
|
315d92f5c0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
7b6b97c1b7
|
修改天津涂装质量检测看板
|
5 years ago |
|
许心洁
|
2d9521e412
|
BUG#12166
|
5 years ago |
|
puxiao.liao
|
7b8597dde4
|
天津麦格纳看板BUG修复
|
5 years ago |
|
puxiao.liao
|
b124db3383
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
f87e4004fb
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
d226c27c2b
|
邮件推送增加获取附件的脚本功能
增加发送附件功能
|
5 years ago |
|
simon
|
173e145c56
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
a1dd0fa36b
|
中航-新增查询质检单检测历史接口
|
5 years ago |
|
宋军超
|
5f9d597943
|
修改天津看板评定项字段DEC->DECEMBER
|
5 years ago |
|
simon
|
e1e0c12344
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
30382c5585
|
中航-公差上线 公差下线字段调整
|
5 years ago |
|
puxiao.liao
|
c6031c2f28
|
天津麦格纳看板BUG修复
|
5 years ago |
|
rock.yu
|
65b26a0696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
a300e6e2f8
|
idoc 记录表增加 erp 状态字段
|
5 years ago |
|
宋军超
|
2df948207c
|
修改天津涂装看板
|
5 years ago |
|
joke.wang
|
e18b6c727e
|
mgn-bj强制封箱完成后重置数据
|
5 years ago |
|
Dominic_Xiao
|
46c0206d6a
|
卡斯马热处理翻包新增模块的dao
|
5 years ago |
|
simon
|
915b86973d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
1ba56bc59a
|
调整过程检验返回结果
|
5 years ago |
|
Dominic_Xiao
|
c2f9937b37
|
新增卡斯马热处理翻包基础模块
|
5 years ago |
|
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 |