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

1048 Commits (1b5df102e72b690b54737869a06f48828efec21b)

Author SHA1 Message Date
汪云昊 f10ff69ce0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
王杰 4f37dc42ef pojo-mes-time-update-wangjie 6 years ago
汪云昊 1d55cd22a6 order by 列类型装换 6 years ago
汪云昊 39a00d3a19 order by 列类型装换 6 years ago
wei.peng 1b30b927ce 自定义表单功能优化 6 years ago
WYnneaoapc c34a369e93 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ef1450e912 Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 6 years ago
汪云昊 619251474d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 f5c0ca9383 软适配模型调整 6 years ago
WYnneaoapc c05e3b13c6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 63d86a4b0d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ecba29948f 816 add method 6 years ago
汪云昊 69525fbaa9 表单菜单排序 6 years ago
曾贞一 cef48801df Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 7455c6c640 软适配配置文件初始化 6 years ago
wei.peng aee54acafc Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 46c710e559 表单功能优化，虚拟属性连表查询，时间格式化对接 6 years ago
wei.peng 6d99080069 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy.zeng c986f7b2a3 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 9ee2901346 添加字典分组 
优化redis资源键
 6 years ago
wei.peng 66f49f3fdc 自定义表单功能调整 6 years ago
曾贞一 8b457c0618 DEV 合并 TEST pom.xml文件修改 6 years ago
于学杰 4235184afc Merge branch 'Process' into dev 6 years ago
于学杰 e7913cfb26 1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV 6 years ago
于学杰 24da688384 Merge branch 'test' into dev 6 years ago
许心洁 31313baec9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process 6 years ago
曾贞一 b3a0a71065 库存初始化信息 6 years ago
许心洁 476d943a69 流程管家：自定义按钮触发的时候不需要预先调用当前步骤的回显信息 6 years ago
许心洁 40fc36ef18 流程管家优化：快速提交流程手动提交校验 6 years ago
许心洁 af7b2404dd Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process 6 years ago
许心洁 d8786d8132 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 fb07628555 Merge branch 'dev' into test 6 years ago
汪云昊 c1cff11c7c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
peter.pan d45b7b77f3 Merge branch 'dev' into test 6 years ago
许心洁 bb8078cb94 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7f3d902a30 流程管家：提交检验+预回显优化； 
直送发运JOB:#5132
 6 years ago
wei.peng 750e4d75dc 添加 XStream 插件 6 years ago
wei.peng bda52f76c6 软适配 Json 请求适配完成 6 years ago
peter.pan 24bbd75c81 Merge branch 'dev' into test 6 years ago
曾贞一 c7571b4c66 IS_GENERAL_TASK 添加单据是否生成任务状态 撤销 6 years ago
许心洁 60e6d51d35 流程管家2.0 6 years ago
peter.pan 8f977719c0 Merge branch 'dev' into test 6 years ago
许心洁 5a7ce32761 冲突 6 years ago
wei.peng b5c204f873 软适配接口制作完成 6 years ago
peter.pan 5c48b2eb79 Merge branch 'dev' into test 6 years ago
汪云昊 035a8b5924 定时任务日志信息优化 6 years ago
wei.peng 90439f55fd 添加 XStream 插件 6 years ago
wei.peng c4db15db9b 添加 XStream 插件 6 years ago
peter.pan 8daa2789a4 Merge branch 'dev' into test 6 years ago
汪云昊 7181e85ba5 安灯导出实体注解 
定时任务日志添加字段
 6 years ago
汪云昊 ccf0764ee6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jenkins 812be94ed3 Merge branch 'dev' into test 6 years ago
wei.peng 7f35883b08 登录会话添加设备ID 
自定义表单添加数据表唯一教研
自定义表单添加映射类型
 6 years ago
wei.peng 90fb9d3190 登录会话添加设备ID 
自定义表单添加数据表唯一教研
自定义表单添加映射类型
 6 years ago
wei.peng fb743ebafc 登录会话添加设备ID 
自定义表单添加数据表唯一教研
自定义表单添加映射类型
 6 years ago
jenkins 409cbb8492 Merge branch 'dev' into test 6 years ago
许心洁 4a717ec544 直送发运JOB+交易处理程序（下线结算）逻辑变动 6 years ago
jenkins f4141fd2c6 Merge branch 'dev' into test 6 years ago
曾贞一 60feef4bb5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 2240819def 发泡打箱包装 6 years ago
刘敏 6e2cf70951 库位校验枚举添加 6 years ago
jenkins 49a936c660 Merge branch 'dev' into test 6 years ago
汪云昊 06bd10152c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 7f1ef0bca7 自定义报表表单打通， 用户在线设置功能优化 6 years ago
汪云昊 d63974140d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 af2e1a811c andon组织模型导入功能 
andon删除关联数据校验
 6 years ago
jenkins 577e1372ab Merge branch 'dev' into test 6 years ago
陈思洁 a064c6b84a 枚举新增条码类型 
库存条码表新增字段
 6 years ago
peter.pan ad09180809 Merge branch 'dev' into test 6 years ago
汪云昊 c1ca7cbcae Andon组织模型操作接口 
Andon班次计算调整
 6 years ago
peter.pan 4149183450 Merge branch 'dev' into test 6 years ago
汪云昊 c11cc65e8f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 d7b79c659c WMS获取系统配置信息 6 years ago
peter.pan 0526fcf05c Merge branch 'dev' into test 6 years ago
汪云昊 19afeb92b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng fea0d476a4 基础操作,数据补全 6 years ago
陈思洁 0e15934d16 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 6a3662283b 枚举修改赋值 6 years ago
汪云昊 0ed90485a6 安灯基础数据导入导出 6 years ago
于学杰 4350a82043 1. 完善脚本引擎 6 years ago
wei.peng c858475bd2 用户权限调整 部门权限调整完成 6 years ago
wei.peng 3a19888ddf 用户权限调整 岗位功能调整完成 6 years ago
peter.pan 53d34096f7 Merge branch 'dev' into test 6 years ago
汪云昊 8e39e6d9fb Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 0041ce328e 定时删除日志 6 years ago
wei.peng 78cd5dc77e 用户权限调整 6 years ago
peter.pan d9ef2677fb Merge branch 'dev' into test 6 years ago
wei.peng 1b1bc67c90 用户权限调整 6 years ago
peter.pan 61ecc2a74f Merge branch 'dev' into test 6 years ago
陈思洁 fba99de795 枚举修改 6 years ago
陈思洁 d47c9f8650 合并冲突pojo 6 years ago
陈思洁 f0e0867e2c 库存移动pojo新增字段 6 years ago
wei.peng a1f8ca3096 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 d2839f6cf2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 58b067e3cc 库存报表存储区级联子存储区查询 6 years ago
peter.pan 5bed1d27ec Merge branch 'dev' into test 6 years ago
陈思洁 79b36a30a4 冲突合并 6 years ago
陈思洁 fe3d392e9b 新增枚举信息 
移库单明细表冗余主表临时字段
新增物料表字段
 6 years ago
peter.pan f3eb8d2356 Merge branch 'dev' into test 6 years ago
wei.peng 541b40d182 合并代码 6 years ago
peter.pan b39d7038fa Merge branch 'dev' into test 6 years ago
许心洁 dec3743911 流程管家推队列查询条件没有封装 6 years ago
wei.peng 2cbc082c7b 动态对象 空数据处理 6 years ago
peter.pan 37b8755485 Merge branch 'dev' into test 6 years ago
汪云昊 d3deaa6081 安灯bug解决 
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
 6 years ago
许心洁 e43c493463 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 994da92b4e 交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG 6 years ago
peter.pan b18d393fe0 Merge branch 'dev' into test 6 years ago
peter.pan e95db40c23 123 6 years ago
peter.pan 543171dfbb Merge branch 'dev' into test 6 years ago
wei.peng 1ac5542541 动态表单分页功能完成 6 years ago
peter.pan e3354f52bd Merge branch 'dev' into test 6 years ago
陈思洁 92daec97e3 枚举修改名字 6 years ago
peter.pan b8730fac47 Merge branch 'dev' into test 6 years ago
wei.peng ac5bf14d6b 动态表单动态操作　功能优化 6 years ago
许心洁 15386ae5c2 枚举 6 years ago
peter.pan 628f1db31c Merge branch 'dev' into test 6 years ago
汪云昊 ff9a5dcd17 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 98de08ba4a 文件上传优化 
字段删除异常
日志添加索引
 6 years ago
peter.pan 96264870c2 Merge branch 'dev' into test 6 years ago
许心洁 efbe9dac9e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 bf02cbf8a4 PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算 6 years ago
peter.pan 9c38ed702a Merge branch 'dev' into test 6 years ago
刘敏 97adebba21 枚举新增 实体字段新增 6 years ago
peter.pan 3b1d19bbab Merge branch 'dev' into test 6 years ago
陈思洁 a8dee4713a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 31f6f4deef 枚举字段新增AMP 
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
 6 years ago
刘敏 1b569ff3a8 ERP同步标识枚举添加 6 years ago
wei.peng ee5a4f1dfe Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 0962b810ce Json 转换精度丢失 6 years ago
wei.peng 5d2695a5cb Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
peter.pan a551249165 Merge branch 'dev' into test 6 years ago
wei.peng 2e5b7466c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 1b4e5143aa 用户单帐号多平台登录 6 years ago
许心洁 364efedc42 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 c783d9119c 任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法 6 years ago
peter.pan 49d35f264e Merge branch 'dev' into test 6 years ago
于学杰 35f92b05e3 1. 修改ERP接口暂存表的字段，增加关联单据类型 6 years ago
wei.peng 1ee9cb24f2 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
陈思洁 2ce560b39f 生产报工明细实体修改和枚举新增 6 years ago
jenkins 470d319504 Merge branch 'dev' into test 6 years ago
sky.meng 3cc4aec00a 库存预警看板 6 years ago
sky.meng 2f1a3080ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
sky.meng 05c56e46b4 库存预警看板开发 6 years ago
于学杰 713503d7ff Merge branch 'dev' into test 6 years ago
于学杰 5d1447c92a 1. 解决标准拣货多级存储区查找的问题 6 years ago
许心洁 41324abdad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
sky.meng 854ee5b3cf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 6 years ago
sky.meng 0f3d67d110 供应商收货看板功能完成 6 years ago
许心洁 8347085f26 冲突 6 years ago
许心洁 e3d5e5bb19 PDA获取任务列表+盘点冻结根据移动明细源库位更新库存 6 years ago
wei.peng eb2f61c32f Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
汪云昊 4309454d2a 邮件异常提示优化 
EXCEL数据通用导出
 6 years ago
wei.peng f32f7e72a2 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
shiyanghuan f3151cbbe3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
shiyanghuan e13d4163b7 库存交易报表代码提交 6 years ago
wei.peng a4016dc911 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
刘敏 34dcf6d526 枚举修改 6 years ago
wei.peng 734340fe63 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 7b83985f40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 f6bf244b12 流程管家放MOVENO的BUG 6 years ago
汪云昊 6259bd56bc 通用EXCEl导出MODEL 6 years ago
jenkins 320910e2ae Merge remote-tracking branch 'origin/dev' into test 6 years ago
许心洁 dfef27151d 冲突 6 years ago
许心洁 f834e91353 Task#764+枚举TRUE_OR_FALSE 6 years ago
jenkins 32cc1db3bf Merge remote-tracking branch 'origin/dev' into test 6 years ago
peter.pan 62b2ea298b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
 6 years ago
peter.pan ea83820fbf 新增物料类型跟单位类型 6 years ago
许心洁 b3272dc3d7 冲突 6 years ago
许心洁 fe13a43ccc WmsEnumUtil冲突（几步法） 6 years ago
jenkins ea4cde868f Merge remote-tracking branch 'origin/dev' into test 6 years ago
陈思洁 fb98db0bcc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 c08a569ac5 sql优化 
数据权限实体增加字段
枚举增加数据权限的交易对象
 6 years ago
刘敏 7d0cd674cf 零星退料指令导入开发 6 years ago
许心洁 79d1da3230 系统数据初始化 6 years ago
jenkins 16bb8d6714 Merge remote-tracking branch 'origin/dev' into test 6 years ago
汪云昊 8e41b40196 excel工具类优化 6 years ago
jenkins 884d4fd763 Merge remote-tracking branch 'origin/dev' into test 6 years ago
汪云昊 21746dc440 excel工具类优化 6 years ago
汪云昊 163cb6240e Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 31c347275c 添加重要度枚举 6 years ago
jenkins ac8b9d3986 Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng b7a7eb29ae 安灯类型 查 表 已从表改为枚举 
安灯动作		查询				表		  已从表改为枚举
安灯状态		 查询						   已从表改为枚举		ANDON_STATUS
通知方式		 查询						   已从表改为枚举
重要度			  查							已从表改为枚举
 6 years ago
jenkins 68fadff818 Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng 2adff745fb 自定义表单　功能优化 6 years ago
wei.peng 0fb7e05e88 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
alwaysfrin 10c276fb16 自定义数据源 6 years ago
jenkins 511df468ec Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng 13af329513 动态查询Cloud 服务基础功能已完成 1.0 6 years ago
jenkins a58888df85 Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng c4dceace92 增加动态报表对外接口-批量修改 6 years ago
jenkins 878108e86f Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng f2b19055d4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 3630f0c2f1 动态查询Cloud 服务基础功能已完成 6 years ago
jenkins 0e70ff103a Merge remote-tracking branch 'origin/dev' into test 6 years ago
刘敏 94166da1ec 条码状态修改 6 years ago
汪云昊 c07858d5ba Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 a5caf4eab5 供应商退货枚举新增 6 years ago
陈思洁 727c1efea8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 507902473c 新增业务类型枚举 6 years ago
刘敏 b0faa179d1 报废状态从条码状态移入到质量状态中 6 years ago
jenkins 1a7cda72d3 Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng 27e4fc8ec2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jenkins 28ae6cf85d Merge remote-tracking branch 'origin/dev' into test 6 years ago
wei.peng aec4b9a85a 自定义表单 多数据源 功能完成 6 years ago
Silliter a39ce52aa9 呼叫升级和响应升级优化 6 years ago
汪云昊 e2cfcc4c5f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 8ea762e5df 细节优化 6 years ago
汪云昊 e514479f00 细节优化 6 years ago
allen.zhang 67e3851a86 Merge branch 'dev' into test 6 years ago
柯裕 10cc2ac052 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 d081c16c61 安灯类型，状态，子类型，基础数据开发 6 years ago
汪云昊 4cbc41a959 细节优化 6 years ago
柯裕 3cba9077fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 f1e8f07a90 新增需求：自处理 6 years ago
wei.peng 7ef2eb0c6e 报表 表单打通 6 years ago
allen.zhang f6d70a2781 Merge branch 'dev' into test 6 years ago
Silliter 1adcd23c6f 呼叫升级和响应升级优化 6 years ago
柯裕 47baf16e0f ANDON动作 6 years ago
allen.zhang d70f85d592 Merge branch 'dev' into test 6 years ago
Silliter 9c5aab7215 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter c9243ccad0 呼叫升级和响应升级优化 6 years ago
陈思洁 e33c7c2465 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 8e7b3d61e7 枚举修改 6 years ago
Silliter 27b32626b3 开发主动升级和启动产线业务 6 years ago
crish 701430066e 事务管理 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
Silliter ba3064d27d Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish 3a7aace277 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 5ba134126a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 1efd33975d 生产队列，生产计划，生产工单优化和bug修复 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
Silliter 8a298687c2 开发andon呼叫停止产线 6 years ago
Silliter 9eb6e82306 开发andon呼叫停止产线 6 years ago
jenkins fef940bcda Merge remote-tracking branch 'origin/dev' into test 6 years ago
jiajack c8a9edab64 质量判定业务修改 6 years ago
allen.zhang d714733a27 Merge branch 'dev' into test 6 years ago
曾贞一 4e45f813dc CS_ORDER_STATUS 枚举修改 
DdlPreparedPack getNotInPack getNotInPackString 方法修改
 6 years ago
许心洁 9200080178 MES-POJO添加产品配置名称，产品类型名称作为冗余字段 6 years ago
allen.zhang e24e7ef421 Merge branch 'dev' into test 6 years ago
Silliter a42bb71aee docker配置文件修改 6 years ago
allen.zhang 440083b5f2 Merge branch 'dev' into test 6 years ago
alwaysfrin 65b5ac3803 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin cc02090910 事务调整及demo 6 years ago
Silliter 630ad20587 开发安灯呼叫升级定时任务 6 years ago
jenkins 21d3c053ca Merge remote-tracking branch 'origin/dev' into test 6 years ago
许心洁 b5696a63f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 e79987d235 MES流程配置接口（流程，产品流程配置） 6 years ago
jenkins a7833ea9dd Merge remote-tracking branch 'origin/dev' into test 6 years ago
刘敏 b90139312c 条码管控枚举添加 6 years ago
yiming.gu 2eb732c7df Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
 6 years ago
yiming.gu 7c647c7844 1、班次pojo修改 
2、andon项目新增组织模型基础数据
 6 years ago