1330 Commits (e8611616db6ee2f02f29d249a54979f932bf763d)

Author SHA1 Message Date
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
王杰 9a74188e55 master merge test 5 years ago
陈思洁 1d799ed294 2447 中航 扣减错误信息保存 5 years ago
joke.wang 8f7d6d46af Fix Bug #9457 5 years ago
王杰 9b6be3167d dev merge test 5 years ago
王杰 d2ff83e22b test merge dev 5 years ago
王杰 411fdbaa7d Merge branch 'test' into dev 5 years ago
王杰 7533a3ef44 [任务2408] 5 years ago
陈思洁 ffbf18944c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 f5b4c666bf 【天津bug修改 9627,9615,9614,9610,9585,9445,9439,9428,9421,9401】 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
wynne1005 3f8789332f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 1252027685 dl小枪 5 years ago
joke.wang b69fcdc0c6 Finish Task #2399 Cost:6h 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
宋军超 448bd77b81 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 538b224f67 新增计划外条码识别上线-PCR功能 5 years ago
wynne1005 cc4d17a81f 大枪ok bug 9492 5 years ago
王杰 7e48674d9e dev merge test 5 years ago
王杰 4260316f62 test merge dev 5 years ago
joke.wang e5cd6692d4 Finish Task #2359 5 years ago
wynne1005 25382f0265 Fix Bug #2357,2358 5 years ago
joke.wang 52ad38fa9d Finish Task #2238 5 years ago
王杰 a2f047553f pom 5 years ago
王杰 c20f630402 Merge branch 'test' into dev 5 years ago
王杰 dc91809bb7 test merge dev 5 years ago
王杰 cff90316a5 ptl 5 years ago
宋军超 3d7b43a7de 修改测试天津问题bug 5 years ago
陈思洁 4137fe1a80 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ba35d0a24b 【新增客户标签模板字段】 5 years ago
王杰 82158d8283 [bug 9238 9096] 5 years ago
joke.wang cdf8c79cce Fix Bug #9408 5 years ago
wynne1005 79fb42e149 MES_PROD_BIND_RECORD添加mdt索引 5 years ago
宋军超 bd251113a7 涂装展示组件添加显示实际包装数量 5 years ago
宋军超 6440fd2dfe 首检、巡检报表新增工单号、产线和产品条码查询条件 5 years ago
wynne1005 a84186e023 中航审核发布 5 years ago
宋军超 716f0ac1f9 对象结构添加是否显示和显示顺序字段 5 years ago
宋军超 93d7b4dac8 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
宋军超 f032b6ddcd 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 cb4bf9f453 merge andon pom 5 years ago
wynne1005 dfa993b9e9 还原pom 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
wynne1005 15f0a37508 还原pom 5 years ago
陈思洁 6bc9aa1f70 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 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
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
宋军超 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
joke.wang ab0ae20d40 Finish Task #2234 客户JIT预装队列 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
joke.wang fff94902f7 Fix Bug #9203 5 years ago
wynne1005 614582ce36 条码表增加乐观锁 5 years ago
wynne1005 aaf9f8a21b 添加乐观锁 日志 5 years ago
wynne1005 1fb2f07ca3 edi 添加队列字段 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
wynne1005 d2869dc31a tmp 5 years ago
joke.wang aabd7b5d1d Fix Bug #9112 5 years ago
joke.wang d44312c470 Fix Bug #9151 5 years ago
袁津哲 56a4edc4c0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 295860683a 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 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
wynne1005 d9f619e1a0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3b5142a1f8 edi 5 years ago