 钮海涛
|
ad887c76b5
|
订单合并功能开发完成。
|
3 years ago |
|
钮海涛
|
584a8c8ee6
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
c31742fa73
|
订单合并功能开发，临时提交
|
3 years ago |
|
钮海涛
|
4ee40a7c85
|
订单合并功能开发，临时提交
|
3 years ago |
nies
|
9b8d5bee8d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
f44a69a46c
|
UserDeatilModel增加登录次数字段
|
3 years ago |
|
nies
|
ec814a2f9d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
b7ba3b1f6e
|
Merge pull request '中航条码补偿字段' (#322) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/322
|
3 years ago |
 王宝玉
|
74f9e00f56
|
中航条码补偿字段
|
3 years ago |
|
nies
|
94dc53adde
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
d5f6d501b5
|
WmsStockSn新增构造函数
|
3 years ago |
|
nies
|
81990edfb7
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
6a07e7ff30
|
供应商新增字段是否首次登录
|
3 years ago |
|
nies
|
0a10cd8283
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
f0ddb6ca60
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
聂帅
|
2f79cf7d2b
|
Merge pull request '条码表新增补偿字段' (#321) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/321
|
3 years ago |
|
王宝玉
|
da44d62f8f
|
条码表新增补偿字段
|
3 years ago |
|
钮海涛
|
d25c206d19
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
90ccea73ec
|
四车间问题修复。
|
3 years ago |
|
nies
|
c03cb8e14b
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
db04d60fbc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
link
|
ba5ddc09e1
|
delete table index
|
3 years ago |
|
nies
|
0c0cfa6f6a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
1086f11875
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
a43b17841f
|
软适配新增SuitRetryModel
|
3 years ago |
|
聂帅
|
846f75b0b5
|
Merge pull request '实盘表增加托盘字段' (#320) from puxiao.liao/i3plus-pojo-lpx:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/320
|
3 years ago |
puxiao.liao
|
403fef80f4
|
实盘表增加托盘字段
|
3 years ago |
|
link
|
73191c1961
|
三方指标查询POJO
|
3 years ago |
|
钮海涛
|
7e73f33b5c
|
新增下发MES的工作块颜色
|
3 years ago |
|
nies
|
2418d6d655
|
修改ext-dev pojo版本为1.0.0.1
|
3 years ago |
|
nies
|
c6367b0795
|
解决screen的冲突
|
3 years ago |
|
nies
|
976369fa10
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
2255d1dfcf
|
(update)软适配新增适配类型表
|
3 years ago |
|
聂帅
|
a70c9cf5ec
|
Merge pull request 'MesProdCfgType 新增 项目代码与报文vehicleCode关系字段' (#319) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/319
|
3 years ago |
蒋鸿辉
|
b7bf7edfa5
|
MesProdCfgType 新增 项目代码与报文vehicleCode关系字段
|
3 years ago |
|
钮海涛
|
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 |