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

6587 Commits (291c0b2a40003f8a4f3bcdc22464277d838c5da8)

Author SHA1 Message Date
rock.yu f368ec88cc 修改流程管家组件调用日志表 5 years ago
joke.wang 33cace48ab 半成品打印增加字段 5 years ago
qianhs c872663847 Finish Task #2080 Cost:8h 5 years ago
宋军超 0b3c53b4ca 修改海纳川问题 5 years ago
wynne1005 e35fdcbc2a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c9cdcb6a0 tmp 5 years ago
rock.yu 71a2b68991 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu b928acae47 1. 流程管家增加记录组件执行耗时的功能 5 years ago
陈思洁 b662a6ebe5 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 26fe63eb8a 【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】 5 years ago
汪云昊 e6ecd4f86f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 0d40470059 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 18a09cc4b6 FTP多文件读取问题 
脚本解析功能初版
 5 years ago
汪云昊 101a71970c 虚拟属性数据校验及参数赋值问题 5 years ago
汪云昊 5a6a7a77fc 平台功能优化，移除通用缓存服务 5 years ago
钮海涛 51bae8d1e6 Fix Bug #10312 修复动态搜索取不到列信息问题 5 years ago
王杰 9a959a5184 pcn enum 5 years ago
陈思洁 41cbe4f380 【10284 19048-注塑生产计划导入变更-20200803】 5 years ago
陈思洁 ce7ca48c4b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 394a332de2 修改展示组件逻辑 5 years ago
陈思洁 72c8e22433 【接口映射代码调试】 5 years ago
wynne1005 88233f080a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3ec8109e82 枪优化 5 years ago
王杰 e8611616db IPC 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
joke.wang c060377822 中航BI 5 years ago
wynne1005 5fad38392e 添加索引 脚本表更新 5 years ago
joke.wang 05fa7dba04 Fix Bug #10227 5 years ago
joke.wang af539c85a7 mgn bug 5 years ago
宋军超 31f289e1be 修改展示组件和电检逻辑 5 years ago
曾贞一 f25a186d77 【2511 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
曾贞一 4ff84de904 【2557 sap指令锁定回传信息增加业务类型，交易类型，erp单号内容】 5 years ago
puxiao.liao 5990e56dfd Finish Task #2540 Cost:8h 
喜德WMS-新增“回传源材料扣减结果”的接口映射
 5 years ago
王杰 bc9adf8ac0 ptl 5 years ago
王杰 784cd87c71 ptl 5 years ago
钮海涛 e239c89e63 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
钮海涛 7f55af4477 Finish Task #2560 Cost:8h 5 years ago
贾文涛 5d19c8876b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 bc2d29c006 【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】 5 years ago
贾文涛 fd42a3292a Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。 5 years ago
许心洁 f791b3f82f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 ffc70e158a BUG#8696 5 years ago
钮海涛 5a64ce6021 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
joke.wang 13f7121610 海纳川看板 5 years ago
贾文涛 70693d5b63 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 01ac2e85da Fix Bug #10087 5 years ago
宋军超 e007a52732 修改海纳川问题 5 years ago
王杰 4a59b5c913 bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728 5 years ago
贾文涛 8180795cd7 功能优化-打包时将工位代码存入包装表 5 years ago
王杰 7f5c1735ea 数据复核 5 years ago
joke.wang ea922affba Start Task #2522 Cost:8h Left:8h 5 years ago
qianhs 163d610265 Finish Task #2080 Cost:8h 5 years ago
puxiao.liao 937eac5e87 Finish Task #2549 Cost:4h 
自动生成领料单增加默认来源存储区、自动获取默认目标库位
 5 years ago
钮海涛 72c1363517 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f2cf6af1fe Finish Task #2523 Cost:16h 
Fix Bug #10065 已增加数据权限控制
 5 years ago
王杰 306b05b4d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 46904c43d1 任务#2528，#2545 5 years ago
puxiao.liao 9b622a27fc Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 3c3a5f6068 Fix bug#9902 
20089+物料拆分条码异常+0724
 5 years ago
joke.wang 3223158529 Fix Bug #10108 5 years ago
王杰 47a155e1d1 git push 5 years ago
joke.wang 2a93bb2ca4 Finish Task #2521 5 years ago
rock.yu 0f8326d5f8 1. 修改扭矩枪采集部分因主数据变动引起的逻辑变动 5 years ago
wynne1005 7593b63cfc 重做枚举 5 years ago
joke.wang 47f7e24f57 Fix Bug #10060 5 years ago
puxiao.liao 47f466d1d6 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao e85acdcfff Fix bug#9994 
库存明细--显示重复
 5 years ago
qianhs 958a45d3dd Finish Task #2080 Cost:8h 5 years ago
钮海涛 fd0f079a6a Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 34be0bde26 增加物料组功能 5 years ago
puxiao.liao 6cd46e07bc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 23f33a79d1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 c18c22a799 修改海纳川电检测问题 5 years ago
贾文涛 c7bba92741 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 35cdb1f257 完善脚本管理功能 5 years ago
贾文涛 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