202 Commits (yun-zuoyi)

Author SHA1 Message Date
王杰 269d325549 ptl 5 years ago
王杰 cd8dea1814 ptl 5 years ago
王杰 3fe76d1713 Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
qianhs 0c85d7132b 1,回退代码 5 years ago
joke a7e8e1095d Merge remote-tracking branch 'i3plus-pojo/dev' into dev 5 years ago
joke aa403e9691 [ptl-pcn:39 校验物料号] 5 years ago
qianhs d87f5653a9 1,任务呢管理
2,生成任务
5 years ago
王杰 68299bf421 Merge branch 'dev' of adair.song/i3plus-pojo into dev 5 years ago
宋军超 e15c2b6065 添加PTL数据同步功能 5 years ago
陈思洁 21c9af2007 【PTL_区段亮灯任务新增实体】 5 years ago
王杰 cde65d0e7a Merge branch 'dev' of gragon.xu/i3plus-pojo into dev 5 years ago
许心洁 a49b747c18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 cc98e84ba4 动态查询:增加开窗功能 5 years ago
陈思洁 83464294bb 【PTL_枚举引用修改】 5 years ago
宋军超 80d9852dd6 添加数据同步和定时任务功能 5 years ago
钮海涛 85dff1fde9 Merge remote-tracking branch 'origin/dev' into test 5 years ago
王杰 8c334d2ffd 平台; 5 years ago
宋军超 96c5b35f83 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 0a0318d639 ptl 5 years ago
宋军超 51d666b5bc 开发PTL--PCN节点维护,同步配置和对象映射功能 5 years ago
luweihao f67dd06cd4 Merge branch 'dev' into test 5 years ago
王杰 34e76f59ce ptl 5 years ago
王杰 3a88bd7a78 ptl 5 years ago
王杰 51ca581f29 ptl 5 years ago
王杰 b64872fc53 ptl 5 years ago
王杰 7d13140a33 ptltag 5 years ago
joke ada46c9626 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 1fd3cd3329 【PTL_增加主任务状态的枚举】 5 years ago
joke ccd62f8d31 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke d212b5cd30 [ptl-pcn: 32 亮灯作业] 5 years ago
luweihao 66f7121975 Merge branch 'dev' into test 5 years ago
陈思洁 d0cda06343 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 f8d4e7f1fd 【PTL_标签打印pojo新增】 5 years ago
宋军超 d056a04403 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 85f157c6a6 设置PTL_BOM中父物料描述默认值为1 5 years ago
陈思洁 720449cd09 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 faaf184e01 【PTL_增加主任务状态的枚举】 5 years ago
宋军超 2c06163f88 添加PTL_主任务明细实体 5 years ago
luweihao 51152656cc Merge branch 'dev' into test 5 years ago
joke 6964d4cf4e [ptl-pcn: 32 亮灯作业] 5 years ago
陈思洁 40094365ce 【PTL_区段亮灯任务明细状态】 5 years ago
joke c73cd26574 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke f01b3664c2 [ptl: 32 亮灯作业程序] 5 years ago
宋军超 cac0f91150 添加BOM中父物料描述默认值 5 years ago
许心洁 2a09c009f3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 0fe0abff63 新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据 5 years ago
宋军超 896bd9b35b 添加基础数据枚举 5 years ago
宋军超 60ad38649d 新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据 5 years ago
王杰 b516ca254c 解决冲突 5 years ago
王杰 39a454f89b ptl 5 years ago
wei.peng b199c5995f Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test
# Conflicts:
#	modules/i3plus-ics-console/src/main/resources/application.properties
#	modules/i3plus-ics-gateway/src/main/resources/application.properties
#	modules/i3plus-ics-regist/src/main/resources/application.properties
5 years ago
wei.peng e1dd7c3cdd PTL 项目初始化 5 years ago