 王宝玉
|
c92b401fe4
|
中航物料对象修复
|
3 years ago |
nies
|
7c80841f6d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
7d06827898
|
clientModel新增requestId
|
3 years ago |
 钮海涛
|
b7adcb40c0
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
aaf5d1c00c
|
订单合并功能开发完成。
|
3 years ago |
|
nies
|
d58b6715be
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
c9535bf555
|
新增产品类型EAM 设备信息管理服务
|
3 years ago |
|
钮海涛
|
dc36c90a87
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
303fa009c6
|
订单合并功能开发完成。
|
3 years ago |
castle.zang
|
a0079ae73f
|
Merge remote-tracking branch 'upstream/test' into test
|
3 years ago |
|
castle.zang
|
b81b9c569d
|
冷热数据分离--重构--测试完成
|
3 years ago |
|
nies
|
b534c07bdb
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
ba78a4b0f7
|
Merge pull request '【19625 21062+质检报表导出失败，需修复】' (#326) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/326
|
3 years ago |
 曾贞一
|
fbc5415086
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
b5fb208027
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
5c9e6ad4cf
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
|
曾贞一
|
cb5db7101a
|
【19625 21062+质检报表导出失败，需修复】
|
3 years ago |
andly.pan
|
0c38056604
|
导出逻辑修改
|
3 years ago |
|
nies
|
23dfbdb6ea
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
53a7709bc8
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
1ee62d1689
|
Merge pull request '仓库健康统计变量，周期和计算频次换成corn表达式' (#324) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/324
|
3 years ago |
jun
|
d21cc02739
|
仓库健康统计变量，周期和计算频次换成corn表达式
|
3 years ago |
|
钮海涛
|
c1eac0e4be
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
钮海涛
|
ad887c76b5
|
订单合并功能开发完成。
|
3 years ago |
|
castle.zang
|
94c61f77f4
|
冷热数据分离--重构
|
3 years ago |
|
castle.zang
|
c2437fd00f
|
接口映射bean
|
3 years ago |
|
nies
|
1ec1192200
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
edc4a74001
|
Merge pull request '中航物料对象导入修改' (#323) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/323
|
3 years ago |
|
王宝玉
|
2e2487ebc0
|
中航物料对象导入修改
|
3 years ago |
|
nies
|
ab699b98b8
|
Merge branch 'test' into ext-dev
|
3 years ago |
link
|
8c65aa1294
|
fix miss field
|
3 years ago |
|
nies
|
c3b145f8dc
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
link
|
ac152cf3f2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
link
|
b04cedf70b
|
添加dao的数据接口
|
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 |
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 |
|
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 |
|
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 |
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 |
|
nies
|
2cff78cba2
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
443a8a200d
|
Merge pull request 'test' (#311) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/311
|
4 years ago |
|
王宝玉
|
4625987eef
|
Mes散件BOM增加项目代码字段
|
4 years ago |
|
王宝玉
|
5056f30f45
|
核心包mes散件产品配置BOM新增项目代码
|
4 years ago |
|
nies
|
7ab206edbd
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
fc9ef265f9
|
修改aps-2的menurootid
|
4 years ago |
|
nies
|
b2da2bd935
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
0400305d91
|
增加aps-2的枚举配置
|
4 years ago |
|
钮海涛
|
b623bde133
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
c8ce17363b
|
四车间问题修复
|
4 years ago |
|
nies
|
39fb0508fc
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
曾贞一
|
7b9a91fd0f
|
【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段，需添加+1110】
|
4 years ago |
gsz
|
365c9e927e
|
17789 20065-排程失败的错误需要在页面上进行提示-20211009
|
4 years ago |
|
gsz
|
3c9bb9fff0
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo
|
4 years ago |
|
钮海涛
|
b0fe76ab6a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
5a73e89e97
|
四车间问题修复
|
4 years ago |
|
nies
|
38add62a60
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
5b5e00eee7
|
model core 增加SysRoleModel
|
4 years ago |
|
nies
|
72673bfa12
|
平台新增用户角色关联model
|
4 years ago |
|
nies
|
28770cf619
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
castle.zang
|
b388ea9926
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
钮海涛
|
da300c7ccb
|
增加一键下发功能。
|
4 years ago |
|
钮海涛
|
6effb386a3
|
增加一键下发功能。
|
4 years ago |
|
钮海涛
|
8de712ad1d
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
462f5c9d58
|
增加一键下发功能。
|
4 years ago |
|
nies
|
85782e1036
|
Merge branch 'test' into ext-dev
|
4 years ago |
 王杰
|
3270395d94
|
安灯
|
4 years ago |
|
臧学普
|
9d8371bdac
|
Merge pull request '工单表增加系统同步标志字段' (#306) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/306
|
4 years ago |
|
nies
|
5666b5d120
|
软适配增加华域相关的配置
|
4 years ago |
|
钮海涛
|
3af6e02e52
|
大逻辑调整前提交：部分下发的订单重新排程不影响交期早的订单。
|
4 years ago |
|
钮海涛
|
2ec1229e75
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
e97f49d8ee
|
修复四车间问题
|
4 years ago |
|
nies
|
7bf443a463
|
WmsActionResponseBean 删除多余的taskNO
|
4 years ago |
|
nies
|
0f92e2bbf9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
聂帅
|
74dab6e6d0
|
Merge pull request '成都麦格纳，wmsCqMaster新增构造方法' (#304) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/304
|
4 years ago |