119 Commits (8e94cbb8fa475965a7d2c84f6c5d11446fa69dad)

Author SHA1 Message Date
宋军超 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