9050 Commits (7fc0619f94d869c28622bebc70c72d17bebffd6d)

Author SHA1 Message Date
聂帅 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
Ye-Bu d108001739 安灯区域、产线、工位model中去除@column 3 years ago
Ye-Bu 518d961575 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
Ye-Bu 84d8fd30d2 新增安灯组织结构表(区域、产线、工位) 3 years ago
王杰 40836cafa4 Merge branch 'test' into ext-dev 3 years ago
王杰 7fb54f758b andon 3 years ago
nies 2c55439d4a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
王杰 a4314ba22e andon 3 years ago
王杰 d1698aaa48 andon 3 years ago
nies 4fde6855ad Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
nies f25fa6a2a6 新增userAccountType查询 3 years ago
王杰 7cd40e35da Merge branch 'test' into ext-dev 3 years ago
王杰 e3373387d2 安灯事件界面配置 3 years ago
王杰 7487be0a8a 安灯 3 years ago
王杰 f4c3656ad7 andon 核心包 流程重构 3 years ago
nies f07421a2e9 Merge branch 'test' into ext-dev 3 years ago
聂帅 1410b57168 Merge pull request 'wms物料子检查项增加动态表单字段' (#344) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/344
3 years ago
王宝玉 05d789ea64 wms物料子检查项增加动态表单字段 3 years ago
nies 5874e7e5b7 Merge branch 'test' into ext-dev 3 years ago
nies dfe93ff37e 新增账号类型字段 3 years ago
nies 187c1382ca 新增用户账号类型 3 years ago
castle.zang 8084d7d11a 添加soft_type,eam_pad 3 years ago
castle.zang 37d7b461f6 添加soft_type,eam_pad 3 years ago
castle.zang 8f1633e797 Merge remote-tracking branch 'upstream/test' into test 3 years ago
backo880607 52aafa0bf4 四车间下发拆分问题修复 3 years ago
nies b89ceeca0f Merge branch 'test' into ext-dev 3 years ago
nies 0ca309e38b 新增报关管理系统 3 years ago
andly.pan e2f8c1c0fd 汽车带修改逻辑 3 years ago
andly.pan 9a18ec0920 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 3 years ago
nies 38e4f49f56 Merge branch 'test' into ext-dev 3 years ago
聂帅 e09dc6fd94 Merge pull request 'MesPartFormula 物料配方表新增参照数量字段' (#342) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/342
3 years ago
蒋鸿辉 fcff103a4d MesPartFormula 物料配方表新增参照数量字段 3 years ago
andly.pan 3cbf42162a Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 3 years ago
andly.pan fbd74baacb 汽车带逻辑优化 3 years ago
castle.zang dff7c3494c 添加token类型 3 years ago
backo880607 0a2b6bccd1 设备人员增加班次时间段。 3 years ago
nies b5eb55feaf Merge branch 'test' into ext-dev 3 years ago
nies 8cd30d3bc8 修改eam端口 3 years ago
castle.zang e8cc06babb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
nies 945db7f238 合并代码 3 years ago
聂帅 428ebcf614 Merge pull request 'MesPartStockSchedule(安全库存配置)新增已下达箱数字段' (#341) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/341
3 years ago
蒋鸿辉 f7a8acb88b MesPartStockSchedule(安全库存配置)新增已下达箱数字段 3 years ago