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

684 Commits (65ea61fd706dc15fbaaece8569f7963dde13f41a)

Author SHA1 Message Date
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 471208d051 SWEB添加条码状态枚举 5 years ago
袁津哲 7f0b99297f Start Task #2019 Cost:16h Left:0h 
Finish Task #2019 Cost:16h
 5 years ago
汪云昊 e416b032c2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
汪云昊 4fc8c2a80d 软适配添加适配发送报文 5 years ago
袁津哲 7aaa8bca6d 合并dev分支代码到test分支 5 years ago
wei.peng adb95f100f Ics 日志收集功能完成 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
袁津哲 868e82d83a Start Task #2019 Cost:16h Left:0h 
Finish Task #2019 Cost:16h
 5 years ago
曾贞一 b2d9741453 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
曾贞一 31c26017c1 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
wynne1005 b43317c11a 还原pom 5 years ago
袁津哲 00f07acd45 Fix Bug #1916,1917 5 years ago
袁津哲 399c9c828e Fix Bug #1916,1917 6 years ago
wynne1005 8ef3997038 还原pom 6 years ago
钮海涛 47131ff13f 修复版本问题 6 years ago
袁津哲 44f313abc4 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 6 years ago
wynne1005 8955fd2f4d mes提测 还原pom 6 years ago
wynne1005 23754d3f18 mes提测 还原pom 6 years ago
钮海涛 999a415d27 修复版本问题 6 years ago
钮海涛 b303cf9a14 修复合并问题 6 years ago
wynne1005 99d3c9d721 提测合并 还原pom 6 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 6 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
 6 years ago
wei.peng 9ee8acae91 合并代码 有代码丢失或者文件丢失请排查此处 6 years ago
wei.peng f161270af8 版本发布 6 years ago
袁津哲 e47f050ff3 优化通用导入工具类和导入逻辑 6 years ago
宋军超 0ccadab4be 任务：【1842】-海纳川通用导入修改对应工具类、实体和model 6 years ago
宋军超 1f55c06368 任务：【1842】-海纳川通用导入添加对应工具类、实体和model 6 years ago
袁津哲 5d1c79ef13 Task1812:仓库健康度指标视图及相关指标自定义(#476) 6 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 6 years ago
袁津哲 3e65986585 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 0e2f50e562 Task1812:仓库健康度指标视图及相关指标自定义(#476) 6 years ago
王杰 786c442d55 解决冲突 6 years ago
钮海涛 c1241bd6c5 修复版本问题 6 years ago
钮海涛 53a421b3b9 修复版本问题 6 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 6 years ago
王杰 029763feb1 pom 6 years ago
王杰 30fcf4f23f pom冲突 6 years ago
汪云昊 717f268c28 POJO版本号还原 6 years ago
钮海涛 281ef662b1 merge test 6 years ago
汪云昊 99b5048ef0 POJO添加序列化id 6 years ago
qianhs 7778ce1afd 类序列号 6 years ago
曾贞一 c85fd2eff0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 24ea607718 【8441 收货回执打印功能完善】 6 years ago
wei.peng 3669fbb4a4 本地版本库雪崩,有问题请排查此版本 6 years ago
王杰 a6e9b90026 pom 6 years ago
王杰 de9017ca5c 冲突 6 years ago
王杰 7d192b36a6 pom冲突 6 years ago
袁津哲 1dad60b129 修改pojo表字段查询页面--添加字段的详细注释，页面查询添加【系统】查询条件Bug：8420 6 years ago
钮海涛 da8b4db890 修复pom版本问题 6 years ago
许心洁 75be7d5078 任务#1744：全局替换自定义搜索功能 6 years ago
汪云昊 0b3d2d6815 软适配REST 适配器调整优化 6 years ago
王杰 de200de372 mes 6 years ago
wei.peng 279ec2d1fe 授权加密问题修复 6 years ago
袁津哲 b23915236b 开发根据实体动态生成数据库文档页面功能 6 years ago
曾贞一 f3e53ff1eb 【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】 
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
 6 years ago
wei.peng effae233bf 对象历史记录 Pojo 创建 6 years ago
wei.peng fe46d8da29 1. 授权封装位置调整 
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
 6 years ago
wynne1005 109c4429ce 还原dev pom 6 years ago
袁津哲 9518628c12 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 533d8e55e8 开发导入模块功能 6 years ago
汪云昊 ccf2f42840 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 edf0b66115 Sonar代码缺陷修复 
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
 6 years ago
陈思洁 5d8fec4938 合并冲突 6 years ago
陈思洁 7505087392 【mes 产品配方导入功能和基础数据维护】 6 years ago
钮海涛 100d8b0019 Merge branch 'test' into dev 6 years ago
汪云昊 34c77d6944 ICS 注册中心监控接口，Actuator对外端口调整 6 years ago
puxiao.liao a2f7c3426e bug7994【7994 麦格纳收货需求差异】 6 years ago
汪云昊 1051b22575 ICS 注册中心监控对象 6 years ago
汪云昊 2772ea6a2f Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-ptl/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
 6 years ago
汪云昊 8a8c3ee34d pom版本调整 6 years ago
汪云昊 e7d176209e Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev 6 years ago
汪云昊 64d83d238f Merge branch 'dev' of wei.peng/i3plus-pojo into dev 6 years ago
汪云昊 3fd17208e2 枚举更新 6 years ago
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式 6 years ago
wei.peng 1d00303306 自定义报表-折线图,饼图,柱状图,矩形图 完成 6 years ago
钮海涛 82d5332861 修复POM文件问题 6 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 6 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 6 years ago
wynne1005 44696061ee 修改pom文件为最新 6 years ago
wei.peng c8c7c73336 自定义报表 布局,元素,报表 功能优化完成 6 years ago
wynne1005 d80b341620 还原test pom 6 years ago
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 6 years ago
wynne1005 4b4bf4e433 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5bf7133ff1 动态查询：BUG#7845；BUG#7676；BUG#7675 6 years ago
曾贞一 779b9d209c 【修改 DEV-pom.xml】 6 years ago
luweihao 12579c7a14 还原pom 6 years ago
王杰 999aae6fc0 解决冲突 6 years ago
曾贞一 2625c2cb0f 【修改 TSET-pom.xml】 6 years ago
王杰 80ca438ce3 test合并到dev解决pom冲突 6 years ago
钮海涛 669874cb9b Merge branch 'dev' into test 6 years ago
许心洁 1d90195de6 3D仓库 6 years ago
曾贞一 5ebb5cbf20 【修改 TSET-pom.xml】 6 years ago
王杰 068a0956db 解决冲突 6 years ago
王杰 b77d3065a4 Merge branch 'test' into dev 6 years ago
许心洁 3d3f134d7f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 c9f6f336af 动态查询：解决了BUG#7658,7660,7661,7663,7664 
3D仓库：联调优化逻辑
 6 years ago
曾贞一 0acf2dc0ae Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
钮海涛 b323b2feae Merge remote-tracking branch 'origin/dev' into test 6 years ago
luweihao 00252caa0c 移动mespcn公用model 6 years ago
许心洁 cc98e84ba4 动态查询：增加开窗功能 6 years ago
luweihao f67dd06cd4 Merge branch 'dev' into test 6 years ago
许心洁 b8d7feb413 动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解 
+
字段无需区分工厂
 6 years ago
luweihao 66f7121975 Merge branch 'dev' into test 6 years ago
许心洁 632ad62c45 动态查询：查询类名需作为动态入参 6 years ago
luweihao 246dd85721 Merge branch 'dev' into test 6 years ago
许心洁 55e3f212ce Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7f161e3bae 3D可视化仓库 6 years ago
jenkins 1ada447069 Jenkins自动合并 6 years ago
puxiao.liao 53a2152ff1 【 7531 在网页的条码打印界面增加一个按钮，可以修改部分条码数量，修改条件，库位为空，库区有值，条码状态为待入库。此部分条码为日生产计划生成的条码。 
】bug7531
 6 years ago
jenkins 24d834cd6d Jenkins自动合并 6 years ago
qianhs e1114d67d2 【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】 6 years ago
jenkins 335c725bca Jenkins自动合并 6 years ago
qianhs 4ccda48061 【 PDA所有流程中，扫描后默认提示的组件去除】【bug7409】 6 years ago
jenkins 27b1f5ca21 Jenkins自动合并 6 years ago
qianhs 22eaa30dab 【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】 6 years ago
jenkins a3823f4a16 Jenkins自动合并 6 years ago
袁津哲 2d30f2da0f Wms动态搜索与自定义列表，表单开发 6 years ago
jenkins d790bcf355 Jenkins自动合并 6 years ago
袁津哲 67ef5c5516 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 89a7cafee4 Wms动态搜索与自定义列表，表单开发 6 years ago
jenkins 33e68b7e9f Jenkins自动合并 6 years ago
wei.peng cb68f62e46 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 8a4974f369 自定义报表 调用调整 6 years ago
jenkins 6371e8df60 Jenkins自动合并 6 years ago
袁津哲 f7c98e3982 Wms动态搜索与自定义列表，表单开发 6 years ago
jenkins a19cace3b1 Jenkins自动合并 6 years ago
puxiao.liao b64327831a 【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号 
】bug7402
 6 years ago
jenkins c1609539cf Jenkins自动合并 6 years ago
许心洁 de0d57179c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 35839db806 BUG#7359 任务列表分组字段和移动单赋值逻辑更改 6 years ago
jenkins a0b67a3723 Jenkins自动合并 6 years ago
袁津哲 8285c87624 Wms动态搜索与自定义列表，表单开发 6 years ago
jenkins 782574c73d Jenkins自动合并 6 years ago
袁津哲 29220002b1 Wms动态搜索与自定义列表，表单开发 6 years ago
jenkins 56e53906ec Jenkins自动合并 6 years ago
袁津哲 cf92fb2b23 Wms动态搜索与自定义列表，表单开发 6 years ago
汪云昊 536200cf2b Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
袁津哲 2f2f24356c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 daf3365ce3 Wms初始化扫描实体字段新增逻辑优化 6 years ago
宋军超 d05fd542b3 2020-01-08添加列表菜单与对应和关系逻辑 6 years ago
宋军超 b9f3ea144f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
宋军超 bca93691ba 2020-01-08添加列表菜单与对应和关系逻辑 6 years ago
袁津哲 7d4ba10449 Wms初始化扫描实体字段新增逻辑优化 6 years ago
jenkins 852be5a130 Jenkins自动合并 6 years ago
袁津哲 76b5087e60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
袁津哲 f323637c94 Wms初始化扫描实体字段新增逻辑优化 6 years ago