6299 Commits (94c21581dcab455d7b1a4d689bffa574814fa73f)

Author SHA1 Message Date
puxiao.liao f385be1d7c 无锡喜德BUG 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 cb4bf9f453 merge andon pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
宋军超 b2587f2288 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 e5f3c553ec bug 9122, 展示组件,配置产品位置参数,如果需要显示多个位置,使用逗号间隔。Fix Bug #9122
bug 9268, 工位BOM查询报错。Fix Bug #9268
bug 9270, 工位BOM查询报错。Fix Bug #9270
bug 9271, 工位BOM查询报错。Fix Bug #9271
所有展示组件添加工步区域缩进功能
5 years ago
王杰 08cce22dbb dev merge test 5 years ago
王杰 02cb107672 Merge branch 'test' into dev 5 years ago
曾贞一 639ac8f223 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 50e2f18c0d 【9280 wms-202007-BH录值完成点击完成按钮系统响应时间过长-0705】 5 years ago
王杰 0e3614eb68 test merge dev 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
陈思洁 6bc9aa1f70 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
汪云昊 39d6609a5f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 a2f7642d53 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 cbf1c97c06 彭伟代码恢复
定时任务日志过滤器
5 years ago
王杰 9b56c6d9bf 【任务2223】 5 years ago
陈思洁 556f112ef8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 49f0c0c33a 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
王杰 46261119d9 mes 5 years ago
钮海涛 24474b4704 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c3398a6cc9 修改中航BH问题 5 years ago
joke.wang 4bb5dbfac5 Finish Task #2236 Cost:8h 5 years ago
joke.wang f8c6247137 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 44e3d667b3 订单池枚举 5 years ago
袁津哲 257fb6c515 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 315e3a266f 优化涂装上线功能 5 years ago
joke.wang 7457e27180 解决冲突 5 years ago
joke.wang 12478a6251 解决冲突 5 years ago
joke.wang 76e3fb0811 Finish Task #Finish Task #2236 5 years ago
wynne1005 445668a9b2 调整jitseq字段类型 5 years ago
wynne1005 1bc846454e Merge branch 'test' into dev 5 years ago
wynne1005 98849d3131 调整jitseq类型 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 7b795c12fb merge master 5 years ago
qianhs b48d38ee62 Finish Task #2080 Cost:8h 5 years ago
宋军超 2d39282521 修改涂装逻辑 5 years ago
陈思洁 27ef6dc7f3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 7f4c173105 【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】 5 years ago
joke.wang ad6249f412 Finish Task #2235 Cost:8h 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
王杰 7517a11a90 [任务:2223] 5 years ago
puxiao.liao 1f6c613488 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 f4edb471c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3d826c5edc 【智能化开发-日志记录优化】 5 years ago
puxiao.liao 1d2c2b7be2 海纳川智能化 5 years ago
汪云昊 517eef8e66 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 0c0eea561d 功能优化 5 years ago
joke.wang ab0ae20d40 Finish Task #2234 客户JIT预装队列 5 years ago
puxiao.liao 559fc003c8 Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
5 years ago
宋军超 59c79b5134 TASK 2205, 开发对接涂装二次箱条码打印。Finish Task #2205 Cost:24h 5 years ago
袁津哲 bdde5bbb9a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 c73ef2b93b 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
wynne1005 b8239f6455 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6956259496 EDI Finish Task #2215 Cost:48h Left:0h 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
钮海涛 629817ddef 三力士数据排程 5 years ago
joke.wang 57a7ddad35 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang fff94902f7 Fix Bug #9203 5 years ago
puxiao.liao 37fb285aa9 海纳川智能化 5 years ago
王杰 5ccf659c94 [bug:9149] 5 years ago
wynne1005 614582ce36 条码表增加乐观锁 5 years ago
曾贞一 7dddac5113 【智能化开发-锁定库位】 5 years ago
wynne1005 aaf9f8a21b 添加乐观锁 日志 5 years ago
wynne1005 1fb2f07ca3 edi 添加队列字段 5 years ago
钮海涛 84698f3042 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 9475667e74 Finish Task #2134 Cost: 8h 5 years ago
袁津哲 9361512fb8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 b1dddb62d3 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
王杰 473ebd5ec8 [任务:2219] 5 years ago
王杰 31d7b71872 mes enum order type 5 years ago
曾贞一 0d7eb7ac67 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 aa09a31957 【智能化开发-锁定库存】 5 years ago
wynne1005 d2869dc31a tmp 5 years ago
joke.wang aabd7b5d1d Fix Bug #9112 5 years ago
joke.wang d44312c470 Fix Bug #9151 5 years ago
许心洁 54241ebf11 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 9d79ed5376 3D仓库规则引擎优化 5 years ago
袁津哲 56a4edc4c0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 295860683a 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
王杰 472b2f1ee6 bug 9149 5 years ago
许心洁 38b154b0cb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 6cd70eb695 3D仓库规则引擎优化 5 years ago
钮海涛 0626d6f969 修复版本问题 5 years ago
钮海涛 e42ea19f37 修复版本问题 5 years ago
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev 5 years ago
王杰 272d647073 【任务2219】 5 years ago
钮海涛 2478fc3b14 修复版本问题 5 years ago
钮海涛 0f2f56163e Merge branch 'master' into test 5 years ago
puxiao.liao 5269cfb732 BH 需求修改 5 years ago
wynne1005 d9f619e1a0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao e599a833f1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3b5142a1f8 edi 5 years ago
宋军超 6f454c95a4 Start Task #2212,2205 Cost:8h Left:16h 5 years ago
宋军超 c44e6ac965 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 e3a86fdbab 涂装条码打印、涂装上线功能联调 5 years ago
钮海涛 2b5f76caee Merge remote-tracking branch 'origin/master' 5 years ago
钮海涛 62c9d8d27d 修复欧洲FIFO跳过未进行交易处理Bug 5 years ago
joke.wang cf1020d82f 删除@Lob 5 years ago
王杰 08fe2de018 mes 5 years ago
joke.wang 2829bb5afb pcn同步对象映射 5 years ago
wynne1005 8ae7ce53b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 a757d2c339 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao 84253d7562 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao b9ac27df19 无锡喜德BUG 5 years ago
joke.wang 2ce2e20c0b 包装扫描数量计算有误修复 5 years ago
袁津哲 f607860c57 Fix Bug #8845
修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug
5 years ago
袁津哲 aaaa591be4 优化关键条码绑定逻辑 5 years ago
曾贞一 3d79d73ff4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 624e8d6461 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
曾贞一 b68f55b062 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
wynne1005 cf1edee02e edi 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
王杰 ed64d12875 pojo 5 years ago
宋军超 712f1e8d3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 5be9081fc3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 f464fd09c5 Merge branch 'test' into dev 5 years ago
宋军超 9218ca44a7 产品条码表添加生产批次lotNo 5 years ago
joke.wang b32136f75d Fix Bug #9078 5 years ago
puxiao.liao fa383f6417 自动化策略主表 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
puxiao.liao 84dbbcd9a8 自动化策略主表 5 years ago
puxiao.liao 2673b9164a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
puxiao.liao aea28cf6bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao e3513bddaa 自动化策略主表 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 1e1f7cc1fb pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
曾贞一 710c6aee3a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 913991d30d 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
袁津哲 3247ef5ed7 优化涂装上线工位展示组件逻辑 5 years ago
宋军超 fe05a76f6f 添加涂装功能实体字段与model 5 years ago
qianhs 20cefbfec6 Finish Task #2080 Cost:8h 5 years ago
袁津哲 66b98dd6d5 1.开发涂装上线功能逻辑
2.开发涂装工单条码打印逻辑
5 years ago
钮海涛 6c6fbf7e2c 新增收货回执显示收货时间功能 5 years ago
陈思洁 3f88a390e4 【8983 需求调整-泰国MES,工单下达逻辑调整】 5 years ago
宋军超 68fa329701 添加涂装打印实体 5 years ago
陈思洁 5431d09073 【8983 需求调整-泰国MES,工单下达逻辑调整】 5 years ago
wynne1005 c8178975af StationRequestBean添加状态机代码 5 years ago
钮海涛 44ba68bb04 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
陈思洁 80e0ec63bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 498d6821a1 【2145 06 1.2.4.6.1.1 注塑计划排产】 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
qianhs 98b0110ff3 Finish Task #2080 Cost:8h 5 years ago