castle.zang
|
365ff091f7
|
脚本引擎移植到动态表单---增加系统参数页面
|
3 years ago |
|
castle.zang
|
15e0f1c3f5
|
脚本引擎移植到动态表单
|
3 years ago |
jun
|
fc0bd05fa1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
3 years ago |
zhang.xw
|
4f6f6878fe
|
ems 异常通知
|
3 years ago |
|
zhang.xw
|
351ed63083
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
zhang.xw
|
e6b8601631
|
xstream 兼容1.4.9
|
3 years ago |
feng.liu
|
e7e4ff1985
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
feng.liu
|
875447706e
|
用户信息导出增加 最后一次登录时间
|
3 years ago |
|
zhang.xw
|
00851bf69f
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
jun
|
4f6c900bcc
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
3 years ago |
|
castle.zang
|
8277abb2b9
|
合并俊生--广东24997 采购订单进度报表增加箱数
|
3 years ago |
|
jun
|
9c4caa09a6
|
24997 采购订单进度报表增加箱数
|
3 years ago |
|
zhang.xw
|
effde55cf9
|
ems新增
|
3 years ago |
|
zhang.xw
|
53303883e9
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
jiaqihou
|
9edb9d33be
|
【fix bas_vendor表新增isSync字段】
|
3 years ago |
|
zhang.xw
|
df46e6498d
|
ems新增
|
3 years ago |
刘峰
|
65fffb9059
|
Merge pull request '中航更改wms物料子检测项字段' (#377) from baoyu.wang/i3plus-pojo:test into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/377
|
3 years ago |
|
刘峰
|
18c7c3f3fa
|
Merge pull request '中航更改wms物料子检测项字段' (#376) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/376
|
3 years ago |
|
feng.liu
|
2afef80aa8
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
feng.liu
|
5e2987c7ea
|
添加能源管理系统配置
|
3 years ago |
 王宝玉
|
1275a97ef9
|
中航更改wms物料子检测项字段
|
3 years ago |
|
zhang.xw
|
b9f1b3afa4
|
软适配记录新增错误描述
|
3 years ago |
dominic.xiao@estsh.com
|
9d3e7f01f0
|
24518 21020-MES-客户JIS预装队列-增加项目代码查询条件-20220812
|
3 years ago |
|
dominic.xiao@estsh.com
|
59b84c38a2
|
北京客户产线表增加区域产线代码字段
|
3 years ago |
andly.pan
|
fa24089d9a
|
逻辑优化
|
3 years ago |
|
feng.liu
|
7a6e22b771
|
Merge remote-tracking branch 'origin/test' into ext-dev
|
3 years ago |
|
jun
|
7872a3852b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
3 years ago |
|
jun
|
03c85bfdce
|
工单下发需要保存总成物料，工单号加物料号确保唯一
|
3 years ago |
nies
|
fb1f9cc68c
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
51e3b28aad
|
Merge pull request '北京扩展对象结构表增加项目代码字段' (#374) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/374
|
3 years ago |
蒋鸿辉
|
613f472ce3
|
北京扩展对象结构表增加项目代码字段
|
3 years ago |
 王杰
|
66e13a7066
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
0e33fa5805
|
pcn-state-cache
|
3 years ago |
|
castle.zang
|
df3228d51e
|
合并俊生--广东工单拉动需要'
|
3 years ago |
|
feng.liu
|
eea613e298
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
feng.liu
|
1c9983b03b
|
添加rest请求webservice方式
|
3 years ago |
|
jun
|
efcab52f73
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
3 years ago |
|
jun
|
55c88ec1d4
|
广东工单拉动需要
|
3 years ago |
|
nies
|
f3360e73a0
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
8f5180b712
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
885bc0fa05
|
core UserModel新增字段
|
3 years ago |
|
聂帅
|
0c9a06798a
|
Merge pull request '物料配方表新增项目代码,门模位置列（MesPartFormula）' (#370) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/370
|
3 years ago |
|
蒋鸿辉
|
7eeadf733b
|
物料配方表新增项目代码,门模位置列（MesPartFormula）
|
3 years ago |
|
nies
|
797c1ba4fc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
7fd4c36e88
|
新增对账单相关model
|
3 years ago |
|
王杰
|
046ddeedb0
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
d070ed170c
|
andon
|
3 years ago |
backo880607
|
58ab257424
|
修复未报工提交问题。
|
3 years ago |
|
王杰
|
357cc60305
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
35dede6c04
|
andon
|
3 years ago |
|
nies
|
2b496239c7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
10967abd1b
|
新增对账单model
|
3 years ago |
|
castle.zang
|
2bfb08f143
|
合并王宝玉-wmsStockSn -增加构造方法
|
3 years ago |
 臧学普
|
ffe6708ea4
|
Merge pull request '中航条码表修改' (#367) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/367
|
3 years ago |
|
王宝玉
|
9b58ec1623
|
中航条码表修改
|
3 years ago |
|
王杰
|
a067fcba6e
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
7432815bfb
|
andon
|
3 years ago |
|
王杰
|
f3c03fed36
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
bf386f4580
|
andon
|
3 years ago |
|
nies
|
8244e9f809
|
新增对账单model
|
3 years ago |
|
王杰
|
b5b90e141c
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
2bded2e4a6
|
andon
|
3 years ago |
|
王杰
|
7bd07f1b7d
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
633ffd269f
|
安灯
|
3 years ago |
|
王杰
|
a373209d31
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
a625f05293
|
andon
|
3 years ago |
|
nies
|
a395c806ea
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
6f40e3df8f
|
Merge pull request 'MesBypssMapping表增加产品位置字段' (#361) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/361
|
3 years ago |
|
蒋鸿辉
|
4b0dc458b2
|
MesBypssMapping表增加产品位置字段
|
3 years ago |
|
nies
|
a4514d0963
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
ad2b876d97
|
修改AndonQueryUserModel
|
3 years ago |
|
nies
|
250567bc00
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
bff90c422c
|
blocksoftswitch新增脚本相关pojo
|
3 years ago |
|
backo880607
|
d37904f596
|
二车间排程逻辑修改
|
3 years ago |
|
backo880607
|
7261399f5a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
backo880607
|
9d070c974c
|
二车间排程逻辑修改
|
3 years ago |
|
王杰
|
d8b7774c1e
|
Merge branch 'test' into ext-dev
|
3 years ago |
Ye-Bu
|
d47f146eaa
|
安灯区域、工位开窗查询接口封装packBean
|
3 years ago |
|
王杰
|
97f4fca506
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
f601fe7594
|
andon
|
3 years ago |
|
王杰
|
28327f411a
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
Ye-Bu
|
bff48cf946
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
Ye-Bu
|
463e863ea4
|
安灯产线、工位下拉查询接口
|
3 years ago |
|
王杰
|
6d88569204
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
05331ea5de
|
安灯组件
|
3 years ago |
|
nies
|
ce359615b9
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
3 years ago |
|
nies
|
8f1e396705
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
361ed8a1c0
|
Merge pull request 'MesQueueOrderDetai新增质量状态字段' (#354) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/354
|
3 years ago |
|
蒋鸿辉
|
6e47adcdd2
|
MesQueueOrderDetai新增质量状态字段
|
3 years ago |
|
backo880607
|
1425c47379
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
3 years ago |
|
backo880607
|
f7f1b46403
|
新增下发生产计划下班时间控制
|
3 years ago |
|
nies
|
a716e47318
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
31dc21afdc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
3 years ago |
|
nies
|
55cc12c01a
|
新增andon查询core的model
|
3 years ago |
 钮海涛
|
1a4537756c
|
Merge pull request '汽车带逻辑优化' (#353) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/353
|
3 years ago |
|
andly.pan
|
11ecbe124a
|
汽车带逻辑优化
|
3 years ago |
|
王杰
|
d6c900f015
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
王杰
|
772dcac79f
|
andon
|
3 years ago |
|
王杰
|
83be0e6f91
|
andon
|
3 years ago |
|
王杰
|
1182fcfa67
|
Merge branch 'test' into ext-dev
|
3 years ago |