I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,736 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'yun-zuoyi'
${ noResults }
Commit Graph

349 Commits (yun-zuoyi)

Author SHA1 Message Date
王杰 a71774ba24 pom 4 years ago
王杰 21ca70f863 pom 4 years ago
钮海涛 c43eba89f3 新增三力士换模时间计算 4 years ago
钮海涛 eeb9ab500b 排程结果优化 4 years ago
钮海涛 6e6b0a7c11 排程结果优化 4 years ago
钮海涛 c4660251cd 优化资源评估中间计算结果。 4 years ago
钮海涛 3d66e54cea 优化资源评估中间计算结果。 4 years ago
钮海涛 3a3bdc664a 修复工作左边界计算问题 4 years ago
钮海涛 b5bbf7aefb 增加等待时间评估规则 4 years ago
钮海涛 7bd17131b5 牵纱拆到手工设备，包布也需要拆到手工设备。 4 years ago
钮海涛 4088a85a5c 更改左边界计算逻辑：后道工序满模即可开始。 4 years ago
钮海涛 3dd67766b2 测试时间 4 years ago
钮海涛 c09a078ce4 获取生产计划开始时间和结束时间去除service调用。 4 years ago
钮海涛 9ace046d1d 修改动态拆分字段为对象关联 4 years ago
钮海涛 99b43a6677 修改枚举 4 years ago
钮海涛 b396d9cfd9 修改枚举 4 years ago
钮海涛 ae88dda60d 新增MDM对象转换工具。 4 years ago
钮海涛 4f697d51ec 演示问题修复 4 years ago
钮海涛 63a8aef96d 演示问题修复 4 years ago
钮海涛 95dffb65e0 新增成品检验报工 4 years ago
钮海涛 736087852e 新增成品检验报工 4 years ago
钮海涛 4590133c27 新增成品检验报工 4 years ago
钮海涛 8b75ed1cfc 新增报工功能 4 years ago
钮海涛 9ee464f67e 新增报工功能 4 years ago
钮海涛 23f6f9285b 增加4车间补满模逻辑 4 years ago
钮海涛 caafb9c317 修改排程计划逻辑 4 years ago
钮海涛 0af24e4704 新增生产计划下发，生产计划打印功能。 4 years ago
钮海涛 9f12a44fb6 完成插单功能 4 years ago
钮海涛 a63334c5a1 去除事务sop 4 years ago
钮海涛 919db8451e 导入问题修复 4 years ago
钮海涛 f31071afc6 add export function 4 years ago
钮海涛 f10f13a8de add import field 4 years ago
钮海涛 2ba2314968 add import field 4 years ago
钮海涛 7cda94ab0c Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 0b354ef001 add import template 4 years ago
许心洁 071b0ea9ce Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
# Conflicts:
#	sonar-project.properties
 4 years ago
钮海涛 3b8a5482ad add sanlux project 4 years ago
王杰 5a5874b137 test 4 years ago
王杰 45a1b63a23 Merge branch 'test' 4 years ago
王杰 f1db936f42 pom 4 years ago
王杰 d2f03a966e Merge branch 'dev' into test 4 years ago
钮海涛 8c4bf4b0fe 修复导入excel大数据问题 4 years ago
钮海涛 1bc4c491b6 修改导入功能 4 years ago
钮海涛 d301332162 合并dev代码 4 years ago
王杰 cd5b882e1f dev merge test pom 冲突解决 4 years ago
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 4 years ago
wynne1005 db87c0c32f pom版本 5 years ago
钮海涛 b9283ec075 合并dev代码 5 years ago
钮海涛 b57ae573ed 合并test代码 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
wynne1005 1e9f1a5c47 质量检测 1 5 years ago
钮海涛 729a7b6990 合并冲突 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
钮海涛 8d38a297d2 三力士演示demo 5 years ago
钮海涛 6dd429d328 三力士演示demo 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
钮海涛 8ae3c65cb3 三力士演示demo 5 years ago
钮海涛 dcc23e56cd 三力士演示demo 5 years ago
钮海涛 2bbc0bea66 三力士演示demo 5 years ago
钮海涛 1581e8b86c 三力士演示demo 5 years ago
钮海涛 c980c6c87c 三力士演示demo 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 629817ddef 三力士数据排程 5 years ago
钮海涛 9475667e74 Finish Task #2134 Cost: 8h 5 years ago
钮海涛 aeb347b1fb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 ce020cc1ab Start Task #2134 Cost: 8h 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
wynne1005 ba1ba8bc0f Merge branch 'dev' into test 5 years ago
wynne1005 8623a5a13d 还原pom 5 years ago
wynne1005 b75347ffc1 还原pom 5 years ago
钮海涛 9f349cd42c Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 9dd7c54678 修复启动问题 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
钮海涛 7982cefc1e Merge branch 'test' into dev 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 414b811871 修复启动问题 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
钮海涛 7b83f8fa50 新增aps序列化id 5 years ago
钮海涛 47131ff13f 修复版本问题 5 years ago
钮海涛 c344f017a9 修复sonar上的问题 5 years ago
王杰 786c442d55 解决冲突 5 years ago
钮海涛 c1241bd6c5 修复版本问题 5 years ago
钮海涛 53a421b3b9 修复版本问题 5 years ago
王杰 7d192b36a6 pom冲突 5 years ago
钮海涛 005d0f7f86 修复合并问题 5 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
 5 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 5 years ago
钮海涛 c6d36af4c9 Merge branch 'master' into test 5 years ago
钮海涛 efe083a9da 修复版本号 5 years ago
钮海涛 288fb4a16b 修改POM版本号 5 years ago
汪云昊 2772ea6a2f Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/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-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
 5 years ago
汪云昊 8a8c3ee34d pom版本调整 5 years ago
钮海涛 1d16e2d938 解决合并冲突 5 years ago
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式 5 years ago
钮海涛 3b987436d8 新增LES管理功能 5 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 5 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 5 years ago
wynne1005 44696061ee 修改pom文件为最新 5 years ago
wynne1005 d80b341620 还原test pom 5 years ago
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
曾贞一 779b9d209c 【修改 DEV-pom.xml】 5 years ago
luweihao 12579c7a14 还原pom 5 years ago
钮海涛 377391abaf 修改导入导出进度明细。 5 years ago
钮海涛 03de37cf7c 修改导入导出进度明细。 5 years ago
钮海涛 4583b87bf5 添加导入导出进度明细。 5 years ago
钮海涛 e1225bbccd 添加执行命令组进度明细。 5 years ago
钮海涛 cf203390b8 修正时间段编辑类型 5 years ago
钮海涛 9e0158e749 修改test分支POM配置 5 years ago
钮海涛 9e34d99d9e 修复资源甘特图拖拽问题 5 years ago
钮海涛 68fc275565 修复资源甘特图拖拽问题 5 years ago
钮海涛 74be235a26 修复资源甘特图拖拽问题 5 years ago
钮海涛 b0bbd132c6 修复资源甘特图拖拽问题 5 years ago
钮海涛 4013ed776b 修复炉资源排程问题 5 years ago
钮海涛 9627b6cf9e 修改资源甘特图侧边栏显示内容 5 years ago
钮海涛 2eb244c41c 修改资源甘特图侧边栏显示内容 5 years ago
钮海涛 14f47f1ab4 修改字段编辑弹出框 5 years ago
钮海涛 6afa007224 新增拖拽接口 5 years ago
钮海涛 8b1ae09885 修改订单甘特图 5 years ago
钮海涛 629e2f8270 新增新增或保存字段信息接口 5 years ago
钮海涛 04b02c084b 新增甘特图可拖拽资源提示功能 5 years ago
钮海涛 335ab2ce51 新增KPI接口 5 years ago
王杰 c87b00756f dev分支修改pom 5 years ago
gcj 49134cc5b3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 81b84d86e5 新增KPI接口 5 years ago
jenkins 0e35bd1d6b Jenkins自动合并 5 years ago
钮海涛 e0f81a73d7 修改甘特图日历接口 5 years ago
jokelone 0dfb948810 Merge branch 'dev' into test 5 years ago
钮海涛 8385038290 修改甘特图日历接口 5 years ago
钮海涛 68bba613e3 新增表达式录入界面接口 5 years ago
钮海涛 222e1b020d 新增表达式录入界面接口 5 years ago
jokelone 056dbaacf2 Merge branch 'dev' into test 6 years ago
钮海涛 57b3b4242e 新增表达式录入界面接口 6 years ago
钮海涛 5e8e05ddb4 新增表达式录入界面接口 6 years ago
王杰 e43d593db6 更新 'modules/i3plus-pojo-aps/pom.xml' 6 years ago
王杰 cfa54aa2b6 修改pom 6 years ago
王杰 338367f3c3 Merge branch 'dev' into test 6 years ago
钮海涛 64bfbb5013 新增甘特图工作块连线功能 6 years ago
王杰 52f4854621 Merge branch 'dev' into test 6 years ago
钮海涛 04009f02e0 新增数据校验功能 6 years ago
jenkins ad6d4f5034 Jenkins自动合并 6 years ago
钮海涛 d819f7b6c7 修复报表分页问题 6 years ago
jenkins d44d5d79ab Jenkins自动合并 6 years ago