3089 Commits (741193be822bab3f5dcc9d696635a6b51a232aab)

Author SHA1 Message Date
聂帅 924339025e Merge pull request '北京pda显示新增分组' (#328) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/328
3 years ago
jun 14678a5bad 北京pda显示新增分组 3 years ago
castle.zang 9aafab3d5a 增加中航新的mes-history的menuRootCode 3 years ago
castle.zang 8fc894b413 Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang db2941fd31 调试bsp方法管理,执行器管理,日志管理接口 3 years ago
聂帅 261fd456d5 Merge pull request '中航物料对象修复' (#327) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/327
3 years ago
王宝玉 c92b401fe4 中航物料对象修复 3 years ago
nies c9535bf555 新增产品类型EAM 设备信息管理服务 3 years ago
castle.zang a0079ae73f Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang b81b9c569d 冷热数据分离--重构--测试完成 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
castle.zang 94c61f77f4 冷热数据分离--重构 3 years ago
castle.zang c2437fd00f 接口映射bean 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
link 8c65aa1294 fix miss field 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
nies a43b17841f 软适配新增SuitRetryModel 3 years ago
castle.zang 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖,全部依赖1.0-TEST-SNAPSHOT 3 years ago
nies 38b1ce6643 (update)更新aps-4的端口为8400 4 years ago
nies d06fe76744 增加aps_3和aps_4的枚举配置 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
nies fc9ef265f9 修改aps-2的menurootid 4 years ago
nies 0400305d91 增加aps-2的枚举配置 4 years ago
nies 5666b5d120 软适配增加华域相关的配置 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
jun a7b6cd22d3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 4 years ago
jun e390e7fc33 成都:PULL_WAY_STATUS枚举新增 OVER_PULL(80, "过点拉动") 4 years ago
聂帅 1314ee7c20 Merge pull request '华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货' (#301) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/301
4 years ago
jun 685166caf7 华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货 4 years ago
聂帅 98706bcc20 Merge pull request 'test' (#299) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/299
4 years ago
Dominic_Xiao e7044a6dfe 修复数据迁移校验数据源BUG 4 years ago
jun 62ddd292c9 17619 19081-盘点策略-增加循环规则 4 years ago
聂帅 b8b9daf870 Merge pull request '17245 19081-出库单-条码明细-导出报错' (#289) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/289
4 years ago
jun 9f7718d92d 17245 19081-出库单-条码明细-导出报错 4 years ago
于学杰 0a8acc71b2 Merge pull request '产线多次提交数据以及 优化首页接口和不合格审理单' (#286) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/286
4 years ago
王宝玉 35f09a6e50 产线多次提交数据以及 优化首页接口和不合格审理单 4 years ago
puxiao.liao d5f8e50dfd Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
andly.pan 98fb50c059 增加枚举
Signed-off-by: andly.pan <andly.pan@estsh.com>
4 years ago
gsz 258e51aaf1 新增二车间工作工序枚举 4 years ago
钮海涛 0450e2665a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 d69c8e682b 销售订单拆分下发。 4 years ago
puxiao.liao 31344a9317 代码合并 4 years ago
puxiao.liao d7b34facf0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
 Conflicts:
	modules/i3plus-pojo-andon/pom.xml
	modules/i3plus-pojo-aps/pom.xml
	modules/i3plus-pojo-base/pom.xml
	modules/i3plus-pojo-bsp/pom.xml
	modules/i3plus-pojo-form/pom.xml
	modules/i3plus-pojo-hardswitch/pom.xml
	modules/i3plus-pojo-ics/pom.xml
	modules/i3plus-pojo-jobflow/pom.xml
	modules/i3plus-pojo-lac/pom.xml
	modules/i3plus-pojo-mdm/pom.xml
	modules/i3plus-pojo-mes-pcn/pom.xml
	modules/i3plus-pojo-mes/pom.xml
	modules/i3plus-pojo-model/pom.xml
	modules/i3plus-pojo-platform/pom.xml
	modules/i3plus-pojo-ptl/pom.xml
	modules/i3plus-pojo-report/pom.xml
	modules/i3plus-pojo-screen/pom.xml
	modules/i3plus-pojo-softswitch/pom.xml
	modules/i3plus-pojo-sweb/pom.xml
	modules/i3plus-pojo-wms/pom.xml
	modules/i3plus-pojo-workflow/pom.xml
	pom.xml
	sonar-project.properties
4 years ago