 钮海涛
|
6ffcbcc863
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
29ae808f7c
|
四车间压缩硫化增加到排程逻辑中。
|
3 years ago |
castle.zang
|
1ad2e71b5c
|
log4j2升级版本
|
3 years ago |
rock.yu
|
a499178031
|
add lost tag
|
3 years ago |
|
castle.zang
|
35abd70bae
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
|
castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT
|
3 years ago |
|
钮海涛
|
2dad4448aa
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
50346624a7
|
新增按班次压缩硫化功能
|
3 years ago |
nies
|
1f0fb96c94
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
e51e82994a
|
Merge pull request 'MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode)' (#318) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/318
|
3 years ago |
蒋鸿辉
|
4d61109541
|
MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode)
|
3 years ago |
|
nies
|
7069b6533a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
39e0235ad9
|
Merge pull request '物料项目关系表新增客户零件号(custPartNo)字段' (#317) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/317
|
3 years ago |
|
蒋鸿辉
|
f1811b42de
|
物料项目关系表新增客户零件号(custPartNo)字段
|
3 years ago |
|
nies
|
bcaa55e348
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
585e2aefe1
|
(update)WmsInterfaceDataMapper增加busiIdList字段
|
3 years ago |
|
nies
|
f28f449d4a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
058a761500
|
(update)增加适配重复记录
|
3 years ago |
|
nies
|
174ef833df
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
ccab3f0c04
|
(update)BsSuitCase增加requestId
|
3 years ago |
|
nies
|
2619f42700
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
a3d2749161
|
(update)SuitModel 增加requestId
|
3 years ago |
|
nies
|
dd699216ac
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
65c22dec22
|
Merge pull request '18934 原材料扣减job替换' (#316) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/316
|
3 years ago |
jun
|
0ef89f2a6d
|
18934 原材料扣减job替换
|
3 years ago |
|
钮海涛
|
d2bbca3491
|
新增同班次物料相同评估规则
|
3 years ago |
|
nies
|
4b3449863f
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
f1e158737b
|
Merge pull request '【18835 19081-盘点策略-循环规则-选项可配置】' (#314) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/314
|
4 years ago |
|
钮海涛
|
55f88edd0f
|
Merge pull request '资源甘特图提示' (#315) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/315
|
4 years ago |
|
钮海涛
|
f74038f88c
|
强插生产计划前提交
|
4 years ago |
andly.pan
|
64e48bf350
|
资源甘特图提示
|
4 years ago |
 曾贞一
|
7f7baa1ea4
|
【18835 19081-盘点策略-循环规则-选项可配置】
|
4 years ago |
|
钮海涛
|
80851b5a06
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
0cf4d5742d
|
四车间问题修复
|
4 years ago |
|
nies
|
204bbad81c
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
38b1ce6643
|
(update)更新aps-4的端口为8400
|
4 years ago |
|
nies
|
7343b4901d
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
d06fe76744
|
增加aps_3和aps_4的枚举配置
|
4 years ago |
|
nies
|
3d4a0e0bb9
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
3552c56d74
|
Merge pull request 'test' (#313) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/313
|
4 years ago |
|
jun
|
93d84b66f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
4 years ago |
|
jun
|
67ed074d35
|
18681 交易类型需要导出功能
|
4 years ago |
|
nies
|
9080a6b468
|
Merge branch 'test' into ext-dev
|
4 years ago |
Dominic_Xiao
|
71ad8a1e28
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
6ba8a2f3bb
|
MES_客户JIT队列下达配置增加项目代码字段
|
4 years ago |
|
castle.zang
|
b4775eabdf
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
castle.zang
|
cf0e1825a3
|
合并jimmy代码
|
4 years ago |
|
castle.zang
|
0c6803eb86
|
合并王宝玉合并请求
|
4 years ago |
 臧学普
|
0e5cafae91
|
Merge pull request 'WmsBH物料子检测项新增录入方式字段' (#312) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/312
|
4 years ago |
 王宝玉
|
cdd7f7bed2
|
WmsBH物料子检测项新增录入方式字段
|
4 years ago |