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 |
|
聂帅
|
9190b765ab
|
Merge pull request '【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段，需添加+1110】' (#310) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/310
|
4 years ago |
 曾贞一
|
7b9a91fd0f
|
【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段，需添加+1110】
|
4 years ago |
|
钮海涛
|
3f8fb8f20f
|
Merge pull request 'ext-dev' (#309) from shuangzhan.guo/i3plus-pojo-guo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/309
|
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 |
 臧学普
|
307b4f7cf6
|
Merge pull request '安灯' (#308) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/308
|
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 |
|
castle.zang
|
d771304733
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
臧学普
|
308e0b6bc3
|
Merge pull request 'StationRequestBean 增加 缓存数据来源class' (#307) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/307
|
4 years ago |
|
王杰
|
77795be8df
|
StationRequestBean 增加 缓存数据来源class
|
4 years ago |
蒋鸿辉
|
0cfac0aaaf
|
工单表增加系统同步标志字段
|
4 years ago |
|
gsz
|
b15164d8a6
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo
|
4 years ago |
|
钮海涛
|
29acf31f74
|
修复四车间问题
|
4 years ago |
|
gsz
|
351e542fd9
|
18062 20065-新增报表显示顶层订单的输入和输出情况-20211019
|
4 years ago |
|
nies
|
b8662be266
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
nies
|
211d20e840
|
修改打印模板复杂查询
|
4 years ago |
jun
|
a7b6cd22d3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
4 years ago |
|
钮海涛
|
10bd8f2f9e
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
b1af42c78b
|
修复四车间问题
|
4 years ago |