6562 Commits (6db85d596b0d4f51d63a77a6efbcc53aa69021d8)

Author SHA1 Message Date
贾文涛 aafb3d36fc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 2e3f5bb2af Fix bug#9994
库存明细--显示重复
5 years ago
rock.yu eef7ed9c32 调整 pojo 引用关系, mes-pcn-pojo 已废弃 5 years ago
rock.yu 1d02d45e61 增加脚本引擎缺失的DAO 5 years ago
rock.yu 9104f42d42 增加脚本引擎缺失的DAO 5 years ago
rock.yu 6fbb76b395 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 7d76a3ecc7 增加脚本持久化类 5 years ago
宋军超 3590ef4b68 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 f0fd8da49c 修改海纳川问题 5 years ago
钮海涛 7a93a935cc Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 5f90efe691 Fix bug#9982
19125+条码打印页面,erpSrcNo字段数据错误,导致打印出的条码数据有误+0727
5 years ago
joke.wang e5d54d8c0a 工位BOM增加预警字段 5 years ago
joke.wang 768e31e636 Fix Bug #9995 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 9b3bb48231 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
贾文涛 3e260a9b86 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4d608dd4c3 扩展dispatcher model 5 years ago
宋军超 5fa18e05f1 修改中航问题 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
贾文涛 c10a7bae7e 增加方法代码字段 5 years ago
钮海涛 0eb571d717 Fix bug #9804 5 years ago
钮海涛 9bde10f13c 修复收货回执界面打不开问题 5 years ago
宋军超 457cb894db 添加工位队列信息功能 5 years ago
puxiao.liao 5006e0a938 Finish Task #2520 Cost:8h
2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库
5 years ago
陈思洁 2636e43b9b 【9914 天津】 5 years ago
joke.wang c90a009e66 Fix Bug #9874 5 years ago
wynne1005 d0e1900a84 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c1fd1f6eee bypass redo release 5 years ago
王杰 03dbb18bb8 8832 PO-HJMGN-19073--TJX5没有设备信息,但是显示了新松线的设备信息。--20200609 5 years ago
王杰 41ff729f99 workorderlog 5 years ago
宋军超 13142b4ce1 修改电检逻辑 5 years ago
曾贞一 374e73128d 【坤泰流程测试】 5 years ago
汪云昊 1aa63db4d3 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 4b3470b1fd 定时任务日志优化
邮件发送失败记录
5 years ago
宋军超 933e9efb3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 3a31ccae70 队列明细添加临时字段 5 years ago
贾文涛 a577eac60a 修复缓存redis时,忽略ModuleServer对象。 5 years ago
wynne1005 f3a13522a1 解决冲突 5 years ago
wynne1005 3ba1c8ee62 新增组件类型枚举 5 years ago
joke.wang a1af94fe70 Fix Bug #9760 5 years ago
宋军超 ae285a6dc6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 4df8a743a7 9735 19048-物料信息导入模板增加喷涂必需信息的维护-2020-07-21 5 years ago
宋军超 076c6c1b4f 扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表,队列明细表,车型散件配置清单,物料信息表。加上条件【一百位条码】,年度型相同,车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息
工位监控逻辑修改:产线添加工位监控模式字段,为空或10执行之前逻辑,为20时不需要查询工单信息,后面逻辑不变
5 years ago
puxiao.liao 31c3fcd868 泰国需求 5 years ago
wynne1005 194f49ca11 agv停车信号 工位重做 倒计时 1 5 years ago
wynne1005 d5ee3d3b29 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 2116fdafc7 agv枚举 5 years ago
宋军超 63163e1140 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 1ac8fae269 修改枪头更换逻辑 5 years ago
曾贞一 b6a0d43bd0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a379c97461 【2444 坤泰流程配置测试】 5 years ago
钮海涛 3e95dd4029 修复北京麦格纳生产报工问题 5 years ago
宋军超 a77bf1a98a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 a25df616e3 修改展示组件,添加查询队列刷新时间;修改PLC标签地址查询条件 5 years ago
puxiao.liao 88b85b03d2 Finish Task #2436 Cost:8h
拣货、客户发运流程简化配置
5 years ago
qianhs c9e4c72901 Finish Task #2080 Cost:8h 5 years ago
钮海涛 e140910db7 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs e17318dbcb Finish Task #2080 Cost:8h 5 years ago
汪云昊 94c21581dc Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 50999e49f2 软适配添加原始报文查询 5 years ago
汪云昊 c230c57c97 定时任务 导入导出
定时任务 重载功能
5 years ago
王杰 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
qianhs 9461057a07 Finish Task #2080 Cost:8h 5 years ago
陈思洁 1d799ed294 2447 中航 扣减错误信息保存 5 years ago
王杰 204da853c3 [任务:2442] 5 years ago
joke.wang 8f7d6d46af Fix Bug #9457 5 years ago
joke.wang 54a51a4c69 Fix Bug #916 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
曾贞一 fd958c1c5f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6dd0614533 【欧洲-定时悬挂链汇总更新库存数据JOB-优化】 5 years ago
wynne1005 bd3e32d39e 小枪调试完毕 5 years ago
宋军超 34a9cbe0ac 修改PTL数据同步逻辑 5 years ago
宋军超 e4384bd569 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 2e5ab2cdcd 条码外上线添加赋值字段 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao 5d62ebf26f Finish Task #2424 Cost:8h
2424 07 1.2.3.7.1新增检查容器包装关系
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
曾贞一 9bf2d5206c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 6750f11459 【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】 5 years ago
曾贞一 791acf7ae8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 dffdf88471 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
joke.wang b69fcdc0c6 Finish Task #2399 Cost:6h 5 years ago
宋军超 885d2c16a1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 300e308394 新增盲检规则导入功能 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
王杰 6de2bc5472 Merge branch 'test' into dev 5 years ago
puxiao.liao df125e71b9 泰国翻包 5 years ago
qianhs 860f6d11f0 Finish Task #2080 Cost:8h 5 years ago
王杰 ec87065eb5 if pick data 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
曾贞一 354d1290f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f99c5232be 【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】 5 years ago
宋军超 1c93d21815 修改字段BIN_NO 5 years ago
曾贞一 da9c698ea4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c0cf08fa19 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
钮海涛 8ae3c65cb3 三力士演示demo 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
钮海涛 8d29e72322 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 dcc23e56cd 三力士演示demo 5 years ago
曾贞一 ef58d72067 【9514 欧洲-定制业务-RFID管理-查询条件无效】 5 years ago
puxiao.liao 9445989545 Finish Task #2338 Cost:4h
2338 07 1.2.3.5.1客户发往地新增维护目标存储区
5 years ago
曾贞一 000097a4c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 82e2366fa6 【2181 06 1.2.3.8 泰国WMS-容器包装关系接口-需求变更】 5 years ago
钮海涛 20a5443fa7 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c05e18db5b 合并源分支代码 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
钮海涛 2bbc0bea66 三力士演示demo 5 years ago
钮海涛 1581e8b86c 三力士演示demo 5 years ago
曾贞一 3620d2abd2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 e9492a86b0 【2315 07 1.2.3.6.3欧洲WMS-RFID查询】 5 years ago
rock.yu c4f8497dda 通用接口的字段映射关系 JSON 中增加 seq 属性,发出的接口报文会按照此属性生序
如果未配置此属性,则默认为 0,即无序
增加此段代码的单元测试用例
5 years ago
钮海涛 f061ff7b73 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c980c6c87c 三力士演示demo 5 years ago
王杰 a452a71924 9461 北京海纳川-线边库拉动接口调整-0711 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
曾贞一 5dfad71e39 【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】
【2310 07 1.2.3.6.3欧洲WMS-RFID发运】
【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】
5 years ago
许心洁 9a62fe0e06 BUG#9302 5 years ago
qianhs e321ca3790 Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 8e99ae38e6 修改测试天津bug 5 years ago
王杰 82158d8283 [bug 9238 9096] 5 years ago
qianhs f0b8cee974 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs ba6be25390 Finish Task #2080 Cost:8h 5 years ago
joke.wang cdf8c79cce Fix Bug #9408 5 years ago
wynne1005 79fb42e149 MES_PROD_BIND_RECORD添加mdt索引 5 years ago
宋军超 a49b57229c Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 595266f536 Fix bug#9343
19125+条码打印页面后端传值新增一个字段值,传表wms_part 字段color +0709
5 years ago
陈思洁 ce4593c381 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 47ef0fa503 【2286 07 1.1.2.2 强制放行ByPass】 5 years ago
宋军超 bd251113a7 涂装展示组件添加显示实际包装数量 5 years ago
汪云昊 c35cd9c169 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 8891c38e66 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 0108649a73 【代码优化-优化】 5 years ago
宋军超 6440fd2dfe 首检、巡检报表新增工单号、产线和产品条码查询条件 5 years ago
wynne1005 a84186e023 中航审核发布 5 years ago
宋军超 716f0ac1f9 对象结构添加是否显示和显示顺序字段 5 years ago
宋军超 93d7b4dac8 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
宋军超 f032b6ddcd 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
汪云昊 0fa8981440 定时任务日志bug修改及优化
资源内存清理方法
5 years ago
曾贞一 c20159da6a 【上架策略-功能优化】 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
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