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

7136 Commits (051417c10e50fbb4cef11d00aca5af3455b72c75)

Author SHA1 Message Date
puxiao.liao 5033c8dde0 Fix bug#11661 
移库单界面增加来源存储区和目标库位的检索条件
 5 years ago
wynne1005 814d22fe09 设备报警 mes端完成 5 years ago
songss e585dce910 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 037e898cd2 新增控制计划相关接口 5 years ago
汪云昊 604b8821eb Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 815daba16d feat(softswitch):ftp适配记录按文件名查询 5 years ago
汪云昊 21f77a0e7b fix(softswitch):ftp适配器并发读取文件重复 5 years ago
宋军超 aa01153c4b 天津麦格纳更新看板子菜单pojo 5 years ago
宋军超 461780e0d0 天津麦格纳修改看板类型枚举 5 years ago
宋军超 ebb965f46d 天津麦格纳添加看板维护接口 5 years ago
Liquor 83bfaaceab 对SPC-KEY-TATA表的相关接口进行了相关优化。 5 years ago
汪云昊 0d20685a55 fix(softswitch):ftp适配器并发读取文件重复 5 years ago
贾文涛 72faca1092 添加索引 5 years ago
宋军超 2bd7650d48 天津麦格纳pojo中所有Double类型字段添加注解 5 years ago
Liquor 3d8842602d 增加了SPC-KEY-TATA表的相关接口。 5 years ago
puxiao.liao 65ea61fd70 增加昆泰其它出库业务类型 5 years ago
wynne1005 8129ca5bee 设备报警 mes端完成 5 years ago
汪云昊 171f39cf01 revert:还原pojo pom.xml报表 5 years ago
汪云昊 56bd07dbf3 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 e11e833309 refactor(opcua):调整pojo位置 5 years ago
puxiao.liao 76725167f7 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao f591139bed 修复TJ MGN BUG 5 years ago
joke.wang f2177fdc1e bypass数据采集bug修复 5 years ago
puxiao.liao 85feb7927a 修复TJ MGN BUG 5 years ago
rock.yu 68a079fa69 Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu 14d2af59d6 增加多级BOM生效功能 5 years ago
王杰 d548660354 连续扫描 5 years ago
许心洁 a939c689f3 任务#2814 5 years ago
joke.wang d9d7e47ca7 生产队列明细唯一索引修改 5 years ago
songss 36df78c9b4 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 8c633f0bc3 优化字段命名规范 5 years ago
puxiao.liao 0f46a23c7a Fix bug#11611 
19081-计划外入库-扫描条码后撤销
 5 years ago
rock.yu 605b7e846a 增加虚零件属性 5 years ago
陈思洁 d5d4942eb6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 604c1443ca 【三色灯控制信息基础页面增删改查】 5 years ago
wynne1005 ea6fc313c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 1975906ee5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 4bd47e64c3 【接口映射-添加字段接口名称】 5 years ago
songss d7edc3a309 增加产品数据校验记录报表接口 5 years ago
陈思洁 0f1f437a9e 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
陈思洁 373e5026c5 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
陈思洁 ad2f084287 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b8e34a34b5 【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】 5 years ago
songss b376450d4b 修改获取复核异常的数据接口返回数据 5 years ago
wynne1005 12f1c4a809 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 708985be2a 中航 设备自动报警 #1 5 years ago
曾贞一 2f717fdd98 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 2d2ff0ddb1 【2801 武汉PRD-AMP-WMS2SAP回传TWD订单收货结果接口】 5 years ago
joke.wang 9fb8962e4e 客退件bug修复 5 years ago
宋军超 979e18c4a7 天津麦格纳修改涂装质检看板 5 years ago
puxiao.liao 4bfb903e54 修复麦格那发运提交事务重复&盘点提交sql异常 5 years ago
宋军超 ba6470baad 天津麦格纳修改组托获取托包规数量 5 years ago
rock.yu d227fcedd4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 11750e9bf1 修改库存快照的pojo，确保快照功能可以正常执行 5 years ago
汪云昊 ffdfd866e0 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 b2bc93abfe Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 816557085f fix(base):修改当前页取值方法 5 years ago
wynne1005 2ae471febd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3c1c6c8c55 新增通用对象 password 5 years ago
陈思洁 e9ce24d6f9 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
joke.wang 612c919e5f bypass优化 5 years ago
puxiao.liao fc351f5599 修复TJ MGN BUG 5 years ago
wynne1005 7c9c0890fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
songss 28d7b79f82 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 114654dd99 冲突解决 5 years ago
wynne1005 696695ef0e 海纳川变更 10923 10894 5 years ago
songss d050274450 新增查询生产表数据接口 5 years ago
陈思洁 5fcdc2d4ea Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 053b609d88 【11559 19081-MESOP30料箱二次校验没有触发20200922】 5 years ago
汪云昊 25c195ba98 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 0ce944ec5f Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 73809df827 合并swebtest代码 5 years ago
songss 2f953ac223 新增获取中航DB复核项接口。新增修改生产数据接口 5 years ago
joke.wang bc383d573b 生产工单增加特殊标示字段 5 years ago
钮海涛 ac4f217c9d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 c4f161e958 Start Task #2795 5 years ago
puxiao.liao ffb45cf3dd 修复TJ MGN BUG 5 years ago
songss 90a96444e7 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss c5de9c9841 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
曾贞一 0f4a8c130c 【冲突解决】 5 years ago
曾贞一 41efdd4de8 【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】 5 years ago
宋军超 61aabc957e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 735838e27f 天津麦格纳修改紧急问题 5 years ago
汪云昊 6ab0f17ac7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 d6f4fa7f92 feat(softswitch):添加报文处理状态及处理结果 5 years ago
汪云昊 673c6d0fe2 fix(softswitch):ftp-linux系统中文件读取失败 5 years ago
puxiao.liao 667d80c37d Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 0c044eed91 修复TJ MGN BUG 5 years ago
钮海涛 7b2c49f638 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 0d0905c454 sweb合并dev代码 5 years ago
puxiao.liao 4ffe517015 修复TJ MGN BUG 5 years ago
宋军超 706d0fc43d 天津麦格纳问题修改 5 years ago
陈思洁 550713320f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 d92c669f79 【11493 20042 标签条码模版需要显示客户名称 0921】 5 years ago
songss f222395015 襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据 5 years ago
puxiao.liao 07f6aabd72 修复TJ MGN BUG 5 years ago
wynne1005 456741c116 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 e7196c3f7f 海纳川 10923 10894 5 years ago
贾文涛 8fb9760f82 对象引用循环嵌套了，此字段不用就删掉。StationRequestBean->MesStateMachineStatus->StepResult->StationRequestBean 5 years ago
贾文涛 772f1b9d28 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 232abdafd3 10984 组装生产线箱条码批次扫描！-2020-09-01,需求开发 5 years ago
宋军超 d5e356938e 天津麦格纳修改组托打印功能 5 years ago
宋军超 cdd1f3eaba Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu 16a2d75a17 结果生产报工job的sqlserver不兼容问题 5 years ago
宋军超 0c93ee5877 天津麦格纳修改看板和条码补打问题 5 years ago
rock.yu 409cd02a8d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 352db6a7fa 工单拉动的日志保存到数据库 5 years ago
joke.wang 72502a863b Fix Bug #11490 5 years ago
puxiao.liao 10edb8ebae Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
王杰 895eb461ab 数据复核 5 years ago
宋军超 95f008a602 天津麦格纳添加组装打印托标签功能，修改物料颜色名称从物料表中取问题 5 years ago
钮海涛 fa467a2e0d sweb合并dev代码 5 years ago
钮海涛 5f144781c9 SWEB合并test代码 5 years ago
钮海涛 6749bda558 合并dev代码 5 years ago
钮海涛 572e749bdb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 b253a020b9 合并test代码 5 years ago
puxiao.liao cbc885748a Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 2c3571b014 修复TJ MGN BUG 5 years ago
钮海涛 ea875c1a3b SWEB功能开发 5 years ago
宋军超 998e87b61d 天津麦格纳修改过程条码补打 5 years ago
puxiao.liao f14cc48243 修复TJ MGN BUG 5 years ago
songss f2d6552f6b Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
songss 20b40ce294 添加 中航-DB复核项 枚举 5 years ago
宋军超 8a392814aa 天津麦格纳修改涂装展示组件添加字段展示 5 years ago
wynne1005 8c0ea0d52f 冲突解决 5 years ago
wynne1005 10d5276fbb 过程检测 演示修改 5 years ago
puxiao.liao e6b5caa61c 修复TJ MGN BUG 5 years ago
joke.wang cce1d91650 客退备件返修 5 years ago
宋军超 e18ad44c14 天津麦格纳修改返工返修 5 years ago
陈思洁 21ca0a9d0d 【11437 19081-半成品预装队列优化-20200917】 5 years ago
陈思洁 7029b75f27 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a9b18733ec 【11218 19081-安灯系统增加PLC交互控制三色灯-20200910】 5 years ago
钮海涛 22e59a3800 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 f9db132861 坤泰SWEBU9接口 5 years ago
rock.yu 17dae82081 增加麦格纳工单的滑动窗口计算逻辑 5 years ago
陈思洁 d6c9e9a061 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 1072b4fd04 【半成品预装队列】 5 years ago
puxiao.liao 5e0c0a4051 修复TJ MGN BUG 5 years ago
puxiao.liao ae6ffa27f4 修复TJ MGN BUG 5 years ago
joke.wang ba8022f9ca 生产队列明细增加条码字段 5 years ago
宋军超 f58e07fa33 天津麦格纳-添加总装质量检测弹框工步和返工返修接口 5 years ago
宋军超 ad5c122df8 天津麦格纳-添加总装质量检测弹框工步和返工返修接口 5 years ago
汪云昊 6156207369 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 d19fbe8cf1 fix(core):用户信息导出时，用户状态信息为空 5 years ago
陈思洁 50c2258f58 【增加查询参数条件】 5 years ago
joke.wang 817f4b2812 客户产线增加字段 5 years ago
wynne1005 7ab755c9f5 过程检测 16 后端接口完毕 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
汪云昊 b38e6ea1ad Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 4e8716f173 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 55a8bcad72 feat(core):系统更新记录功能 5 years ago
王杰 6dca5ccb09 异步任务 5 years ago
钮海涛 48443a57de 合并test代码 5 years ago
钮海涛 a3eb1e83f3 Fix Bug #11320,#11213 5 years ago
puxiao.liao 900fd5d5b7 MGN标准库存支持修改拆包 5 years ago
wynne1005 3858b2e3d9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 dd1ece9be8 新增过程检测 检测结果枚举 5 years ago
钮海涛 6e803445d7 Fix Bug #11320,#11213 5 years ago
钮海涛 485c66aaf7 合并test代码 5 years ago
wynne1005 531fe743c2 过程检测 完成首检判断 5 years ago
宋军超 6fa35ad939 天津麦格纳取消条码补打校验逻辑 5 years ago
曾贞一 6e252705ab Merge branch 'test' of helin.huang/i3plus-pojo-liquor into test 5 years ago
puxiao.liao 6e22be2d37 麦格纳ASN收货看板修改 5 years ago
liquor e75745380e 【11324 20011--北美收货自动打印时批次字段为2020-09-11，需要后台在传给前端时将后三位字符去除，变为2020-09用于客户目视化-0914】 5 years ago
曾贞一 f7fcb1f530 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3267a9b54f 【如东AGV接口】 5 years ago
puxiao.liao 92c2a49b90 麦格纳ASN新增异常 5 years ago
liquor ddf9936d74 在看板中增加了一列“来源库位”。 5 years ago
wynne1005 d00dcd80eb 冲突解决 5 years ago
wynne1005 7412eb3f16 质量检测 5 years ago
陈思洁 f19ee854be Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 802c801013 【11310 19081-下达至下线时间预警-20200913】 5 years ago
puxiao.liao 039fc9106b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 6765c58de2 Fix bug#11212 
生产报废的条码在条码状态中查询是入库状态 --20200914
 5 years ago
王杰 cf26f7eadd mespcn异步任务 5 years ago
wynne1005 1e9f1a5c47 质量检测 1 5 years ago
陈思洁 d3f754c8a6 【客户JIT生产队列增加字段】 5 years ago
钮海涛 31791ea8cc Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 17c64fbf46 修改麦格纳最早批次问题 5 years ago
puxiao.liao 8ac53abe9e 麦格纳ASN新增异常 5 years ago
宋军超 0d5ade92a9 天津麦格纳添加工位缺陷导入功能 5 years ago
puxiao.liao 08f76c099e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 65b18c6b91 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 d127413055 【11225 19081-客户JIT生产队列需要能够选择L7级零件，进行对应订单的筛选-20200910】 5 years ago
puxiao.liao 9954b1e83a 麦格纳ASN新增异常 5 years ago
rock.yu 36dd266065 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 9a2a596094 增加条码操作类型-发运校验 5 years ago
宋军超 0c855ba2af 天津麦格纳问题修复 5 years ago
钮海涛 cb39559a3d Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 6cc11a637d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c947df6c66 【坤泰接口优化】 5 years ago
puxiao.liao 15a259c8b2 修复MGN系列BUG 5 years ago
钮海涛 cfd507438e 天津麦格纳问题修复 5 years ago
宋军超 bd20bc1552 天津麦格纳修改涂装条码打印 5 years ago
joke.wang b389da7c2f Fix Bug #11260 5 years ago
puxiao.liao c91511185a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 3cf5c70774 修复MGN系列BUG 5 years ago
陈思洁 40cef1961c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8a1f0c608e 【基础页面增加替代料功能】 5 years ago