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

2190 Commits (6061f89d43525d02e18e878efddf1093b181b4d8)

Author SHA1 Message Date
puxiao.liao 583c750055 BH 需求变更 5 years ago
宋军超 fd9a2e6d15 Start Task #1887 Cost:8h Left:8h 5 years ago
puxiao.liao 1dc9276e9a BH 需求变更 5 years ago
puxiao.liao c06fee639d BH 需求变更 5 years ago
qianhs 17b27da539 BH-CODE 出库，绑定 5 years ago
王杰 074093a46d [任务：1850 ，安灯流程设计] 5 years ago
钮海涛 ad79c9fd7b 修改BH基础数据 5 years ago
qianhs f4c4b4a1f6 1,产品条码事务实体类提交 5 years ago
joke.wang 1a72c16f14 Finish Task #1890 Cost:8h 5 years ago
陈思洁 4d63f9817e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 9b8342b7f5 【1865 客户JIT生产队列，自动下达定时JOB】 5 years ago
钮海涛 999a415d27 修复版本问题 5 years ago
钮海涛 b9cbf9684b Merge branch 'test' into dev 5 years ago
钮海涛 4921d55bda 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
puxiao.liao 491bc32325 Fix Bug#8345 5 years ago
贾文涛 a68475d3d0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 a8efa90089 bug 7461,count时去掉distinct。Fix Bug #7461 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 f50b76cd1f Task1858:电枪枪头更换计数 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 6dd2f12a2a Merge branch 'dev' into test 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
王杰 56ae714283 【任务：1845，安灯】 5 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 5 years ago
wei.peng 9ee8acae91 合并代码 有代码丢失或者文件丢失请排查此处 5 years ago
袁津哲 08b03c9eb8 Task1858:电枪枪头更换计数 5 years ago
joke.wang e2ce63a9cd bug: [8533] plc数据类型改为枚举 5 years ago
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑 5 years ago
宋军超 1f55c06368 任务：【1842】-海纳川通用导入添加对应工具类、实体和model 5 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 5 years ago
王杰 786c442d55 解决冲突 5 years ago
宋军超 af6b0ce0fd 任务：【1842】-添加海纳川5个基础数据模块的实体与枚举 5 years ago
钮海涛 c1241bd6c5 修复版本问题 5 years ago
钮海涛 53a421b3b9 修复版本问题 5 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
王杰 029763feb1 pom 5 years ago
王杰 30fcf4f23f pom冲突 5 years ago
王杰 716e1f7df1 Merge branch 'test' into dev 5 years ago
宋军超 912ef81271 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 373808e20d 任务：【1928】-添加检测单-检测类型枚举修改code描述 5 years ago
qianhs 8d61db5ed5 任务:1786,1787,1788,1789 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
钮海涛 281ef662b1 merge test 5 years ago
汪云昊 c27ebee3f9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 9532489502 POJO添加序列化id 5 years ago
qianhs c38757de19 盘点 5 years ago
wynne1005 a4551a746a [优化] 修改DdlPackBean查询 -> 工厂代码可以是英文或中文 5 years ago
宋军超 dfce22d654 任务：【1928】-添加检测单-检测类型枚举 5 years ago
陈思洁 9865558af3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 6fbfea417f 【1804 质检检测-来料检验功能】 5 years ago
汪云昊 e8ea5a3c90 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 d86cdfe4ff OPC UA 优化 5 years ago
陈思洁 c0f5709bb2 【合并冲突】 5 years ago
陈思洁 aef8841223 【合并冲突】 5 years ago
陈思洁 60973a3ee0 【1804 质检检测-来料检验功能】 5 years ago
puxiao.liao e9873905ef Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 6b9b2e8dd2 BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】 5 years ago
贾文涛 c4510fb121 BUG #8485,修复数据权限-查询启用禁用无效 5 years ago
puxiao.liao 8e8744d3db Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
puxiao.liao e8dd3ab12f 8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String) 5 years ago
wei.peng 3669fbb4a4 本地版本库雪崩,有问题请排查此版本 5 years ago
王杰 a6e9b90026 pom 5 years ago
钮海涛 34a3598508 bug:8385 5 years ago
宋军超 1f5052d679 添加检测过程类型枚举 5 years ago
宋军超 82af372fc0 添加检测过程类型枚举 5 years ago
qianhs 8d6ffbb012 bug:8268;8267;8266;8265 5 years ago
王杰 de9017ca5c 冲突 5 years ago
王杰 c68d49880c Merge branch 'dev' into test 5 years ago
王杰 7d192b36a6 pom冲突 5 years ago
qianhs eb7511c39e bug:8268;8267;8266;8265 5 years ago
puxiao.liao f765493696 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
 5 years ago
puxiao.liao 70aeae21d3 8426 中航-报表中心-采购计划更改查询-查询条件无效 5 years ago
钮海涛 8ae8383e79 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 23b06a53af bug:8404 5 years ago
钮海涛 da8b4db890 修复pom版本问题 5 years ago
宋军超 32de58277a 添加MES_检验单和MES_检验单明细的实体和枚举 5 years ago
宋军超 7ef769268d 添加MES_检验单和检验单明细实体与枚举 5 years ago
许心洁 75be7d5078 任务#1744：全局替换自定义搜索功能 5 years ago
joke.wang 5fb7eecee0 [任务：1752 oee看板] 5 years ago
许心洁 ef6330675c 任务#1744：全局替换自定义搜索功能 5 years ago
贾文涛 e668ef4b28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 eadf0d67f8 添加数据权限处理方法 5 years ago
钮海涛 f87eeeb491 修复合并版本问题 5 years ago
钮海涛 ac268c1cbc Merge branch 'test' into dev 5 years ago
puxiao.liao ba81a26700 1778 产品工装关系维护 5 years ago
joke.wang f6e2a509f0 [任务：1751工厂小时OEE] 5 years ago
曾贞一 1901cf6eb0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 2dac15c248 【1709 BH-录入检测值】 5 years ago
钮海涛 40a87d83b3 修复合并问题 5 years ago
钮海涛 005d0f7f86 修复合并问题 5 years ago
钮海涛 bc269e1f71 Merge branch 'master' into test 5 years ago
wynne1005 1cda7e902b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 345b261118 设备添加枚举EQU_DEFECT_CAUSE故障原因,EQU_DEFECT_METHOD故障处理措施,EQU_DEFECT_PHENOMENON故障现象; 5 years ago
wynne1005 27e4fb164b Merge branch 'dev' into test 5 years ago
wynne1005 d925ec62bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 888d87f12e task edi 5 years ago
joke.wang f38a47cc68 [oee 定时任务] 5 years ago