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

8195 Commits (4fdab21958d1dd0dfd3645fcba40656f4b5069f6)

Author SHA1 Message Date
wynne1005 64c2ed920f 修改通用界面端口 还原第三方数据库连接字符串中的时区 4 years ago
wynne1005 0ba5c62931 Merge branch 'screen' into dev 4 years ago
wynne1005 714a32a994 first commit 4 years ago
Dominic_Xiao f12c568119 天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值 4 years ago
Dominic_Xiao cc86a60ba7 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao 9eba8f1683 天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段 4 years ago
joke.wang 072bc431fb 扭矩采集 4 years ago
shun 1fbccdcf40 查询移库单增加供应商名称 4 years ago
simon.song 3c6a7b410d Merge remote-tracking branch 'origin/test' into test 4 years ago
simon.song 5554bfd14c 14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17 4 years ago
puxiao.liao 2adc935bb0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-mes-pcn/pom.xml
	sonar-project.properties
 4 years ago
钮海涛 23f6f9285b 增加4车间补满模逻辑 4 years ago
许心洁 4f919011dc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
github33 9a4aae9f68 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
github33 a61f2c1778 CYCLE_RULE--新增枚举 4 years ago
王杰 38d03b1060 状态机优化 4 years ago
wynne1005 7767630fbb tmp 4 years ago
wynne1005 15633bc28e tmp 4 years ago
陈思洁 9e0d03629c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 281957a6f5 【3324 泰国-扭矩采集 --PC端后端】 4 years ago
joke.wang 3d0d39ac1d Tha扭矩采集 4 years ago
陈思洁 ccf221f80b 【pojo改名字】 4 years ago
陈思洁 39ced0a83d 【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】 4 years ago
汪云昊 1ef29d1fce revert(pojo):还原pom版本 4 years ago
汪云昊 1eae64bafe Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 95052a4e78 Merge remote-tracking branch 'origin/dev' into dev 4 years ago
汪云昊 46e068ccdb feat(softswitch):REST按状态码重试 4 years ago
joke.wang 7f8dd50412 物料关系表 4 years ago
wynne1005 a44a4a8be3 Merge branch 'dev' into test 4 years ago
wynne1005 d97a855e83 移除screen 4 years ago
Dominic_Xiao 9fc68bc443 14382 19081-安灯广播速度调整未生效-20210312:修改播放速度类型为浮点型 4 years ago
汪云昊 4272aad4ac Merge remote-tracking branch 'origin/dev' into dev 4 years ago
汪云昊 d45d5175dc feat(softswitch):REST按状态码重试 4 years ago
wynne1005 44f61e1525 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 385156cd18 refactor(core): SSO 支持方式变更 4 years ago
Dominic_Xiao e58ffc9d69 天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段 4 years ago
汪云昊 fc28ea2346 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
钮海涛 ffa0aa94f8 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 caafb9c317 修改排程计划逻辑 4 years ago
汪云昊 2443d1d8e6 feat(softswitch):REST按状态码重试 4 years ago
Dominic_Xiao ce91ea879f 天津-PCN新增功能:物料校验客户标签 4 years ago
许心洁 f363979f24 任务#3328 4 years ago
wynne1005 f21c618f70 feat(Screen): pojo建立 
pojo建立
 4 years ago
puxiao.liao cc8d2a5441 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
simon.song f73570b28e 漏提交代码 4 years ago
puxiao.liao f9c3fc705b Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao 4ceb2b70c7 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao d129a3863b 天津-新注塑区域集中下件 4 years ago
simon.song 2dc6a886fe 14492 19048-产品追溯报表OP10-OP70工位，日期字段显示的信息不对-20210316（时区问题） 4 years ago
joke.wang cd5773fb2e 绑定关键件增加显示列 4 years ago
王杰 e40744e65a Merge branch 'test' into ext-dev 4 years ago
王杰 f8e0146b19 pom 4 years ago
王杰 af11605d46 工步 4 years ago
钮海涛 257647de0a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 0af24e4704 新增生产计划下发，生产计划打印功能。 4 years ago
曾贞一 f05c9bfaa4 Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
曾贞一 05ce6976e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 18b9a8c6c9 【14212 20162--库存调整盘点需要增加卡控逻辑--20210310】 4 years ago
joke.wang 6a00f4f7f9 14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序 4 years ago
汪云昊 46d94c051a Merge remote-tracking branch 'remotes/origin/dev' into test 4 years ago
汪云昊 af4ce0fa32 feat(impp):组织结构添加事业部节点 4 years ago
钮海涛 1072a62f79 PDA首页增加目标存储区显示 4 years ago
钮海涛 ec35afa34e Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 9f12a44fb6 完成插单功能 4 years ago
puxiao.liao aec66afa83 修复泰国翻包 4 years ago
andly.pan 5859716998 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
andly.pan 5e98df411e 更改重置参数 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 4 years ago
wynne1005 8b1e28c893 删除mongo依赖 merge test 4 years ago
wynne1005 bbb4d57abc 删除mongo依赖 4 years ago
wynne1005 d627d024a7 移除mongo依赖 4 years ago
wynne1005 62d9679308 删除mongo依赖 4 years ago
wynne1005 b48f30fd47 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
汪云昊 960ec37cbc Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
汪云昊 a067683998 Merge remote-tracking branch 'remotes/origin/dev' into test 4 years ago
puxiao.liao 2da5b569a6 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
puxiao.liao 29ee22da5d 软适配定时任务的修改 4 years ago
andly.pan 4261e9d34e Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
andly.pan faeef7b511 swebplanOrder增加过期字段 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 4 years ago
汪云昊 2fd80792ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
汪云昊 c60daac399 feat(mdm):mdmhql工具调整 4 years ago
钮海涛 be664bf464 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 a63334c5a1 去除事务sop 4 years ago
wynne1005 31f26f5b4f Merge branch 'dev' into test 4 years ago
wynne1005 b8d254e55e 增加平台配置类型 4 years ago
joke.wang 19872ba443 隔离报废 4 years ago
陈思洁 c2dbff5d5a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 6b4ae7eb71 【3254 泰国-上装总成套膜标签打印】 4 years ago
joke.wang 0c4e6359fc JISA导入优化 4 years ago
joke.wang fbab36aad2 报废隔离 4 years ago
andly.pan 754124ff25 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
汪云昊 c6031a0fc4 feat(softswitch):添加sap-rfc适配器 4 years ago
wynne1005 6adc396aef 删除动态表单的元素样式类型 4 years ago
wynne1005 dce748fdd8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
wynne1005 2a63c05597 删除动态表单的元素样式类型 4 years ago
wynne1005 4d40686be8 删除动态表单的元素样式类型 4 years ago
曾贞一 54e691bc30 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 2e49522aec 【14115 20063-BH基础数据增加导出及导入功能-20210305】 4 years ago
joke.wang 24aa100dfe 追溯总览报表 4 years ago
wynne1005 1f94eee641 Merge branch 'dev' into test 4 years ago
许心洁 ab05112dc4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
陈思洁 efebc6f605 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 154307b2f0 【泰国工位传参修改】 4 years ago
许心洁 2127e3d260 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
joke.wang 339cbf0634 bug:14146 一张报表中查询产品所有追溯信息 4 years ago
许心洁 4ae7700104 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao 44af0f4e80 删除重复实体类 4 years ago
puxiao.liao 5b3046f482 天津麦格纳BUG修复 4 years ago
joke.wang d7da6437b3 获取状态机dao bug修复 4 years ago
钮海涛 919db8451e 导入问题修复 4 years ago
王杰 4d81424794 numberrule 4 years ago
王杰 5e290e81b8 number rule 4 years ago
wynne1005 8c3a652ada Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 6318ca6afc feat(form): 动态表单新增跳转详情页枚举 4 years ago
simon.song dbeb6baac7 14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28 4 years ago
joke.wang f01ae5106b 14165 返修队列增加校验 4 years ago
钮海涛 7d47979fe1 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 f31071afc6 add export function 4 years ago
王杰 6b7cfa6659 Merge branch 'test' into ext-dev 4 years ago
王杰 3cd06f5be3 pom 4 years ago
许心洁 d223ff242d BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失 4 years ago
王杰 04756b1a6d Merge branch 'test' into dev 4 years ago
钮海涛 52644c1deb Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 f10f13a8de add import field 4 years ago
许心洁 38e6870f04 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
puxiao.liao a98066dbe8 接口增加字段信息 4 years ago
王杰 431ee97d64 同步工单表 4 years ago
王杰 f4e9bf4603 Merge branch 'test' into ext-dev 4 years ago
王杰 94d38bb175 test merge dev 4 years ago
王杰 fe6940b0dc 编码规则扩展 4 years ago
joke.wang b505fe8456 13858 20027--接口表同步情况报表 4 years ago
joke.wang e2a9222b47 pcn登陆限制 4 years ago
曾贞一 76079c9bee Merge branch 'test' into ext-dev 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
 4 years ago
puxiao.liao 485fe13202 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
puxiao.liao c880d51c9d 修复泰国翻包 4 years ago
钮海涛 90169cd8b0 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 2ba2314968 add import field 4 years ago
曾贞一 c63df1ed7f Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
Dominic_Xiao 0c9dff6dd8 不良品处理根据物料类型查询位置 4 years ago
Dominic_Xiao c1eb51dec5 缺陷位置新增产品类型字段 4 years ago
王杰 dbc417269b test merge ext-dev 4 years ago
王杰 03d95e2591 Merge branch 'dev' into test 4 years ago
王杰 e66a560661 冲突 4 years ago
王杰 ec3d2f8557 pom 4 years ago
王杰 4644639c2e pom 4 years ago
王杰 c06902f8de 冲突 4 years ago
曾贞一 462ed4f1de 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
曾贞一 7b3ef8f268 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
曾贞一 5af6f3ae7f 【13795 20027--现中航BH数据检验完成后无法将数据通过接口传输到老WMS系统--2021-01-21】 4 years ago
钮海涛 7cda94ab0c Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 0b354ef001 add import template 4 years ago
王杰 096e2fc8bf test merge ext-dev 4 years ago
王杰 f0c09ca0e6 Merge branch 'test' into dev 4 years ago
王杰 2b89e35c69 pom 4 years ago
王杰 78b5bb0c08 Merge branch 'test' 4 years ago
王杰 7111a3b60f pojo 4 years ago
simon.song ca8ca18f34 数据同步接口修改查询条件 4 years ago
许心洁 1367584df0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 cf83ab060d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
simon.song 24bd5ab668 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
 4 years ago
simon.song ff5348bf99 中航看板取值修改 4 years ago
simon.song 9c51146117 数据迁移接口修改 4 years ago
王杰 5a0927299b 新建表报错 bug 4 years ago
simon.song 78a96c6583 mes管理端增加数据迁移功能相关接口 4 years ago
许心洁 5fae039262 合并测服代码 4 years ago
许心洁 55ba26ad22 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 22c55fc8c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
joke.wang e967dde7a3 总屏幕看板优化 4 years ago
Dominic_Xiao 553fb09bc0 修改hql去除多余工厂代码条件 4 years ago
许心洁 071b0ea9ce Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
# Conflicts:
#	sonar-project.properties
 4 years ago
许心洁 410b95aefd Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms 
# Conflicts:
#	modules/i3plus-wms-apiservice/pom.xml
 4 years ago
simon.song db0d184aa3 数据迁移功能完成。 4 years ago
肖奕扬 9f0dfdb1fd Merge branch 'test' of frank.yu/i3plus-pojo into test 4 years ago
Dominic_Xiao cf908f2d04 卡斯马基础界面--客户条码规则、产品容器容量配置 4 years ago
puxiao.liao 696a0a8c3f 修复单据条码展开日期 4 years ago
钮海涛 3b8a5482ad add sanlux project 4 years ago
王杰 25303ffc55 Merge remote-tracking branch 'i3plus-pojo/dev' into dev 4 years ago
王杰 5a5874b137 test 4 years ago
王杰 45a1b63a23 Merge branch 'test' 4 years ago
王杰 84d9ec15f2 pom 4 years ago
王杰 f1db936f42 pom 4 years ago
王杰 d2f03a966e Merge branch 'dev' into test 4 years ago
joke.wang 5e1fac42fe 12112 设备周期作业计划需要与作业要求进行关联 4 years ago
yumingxing 86a6fb1390 报表2021026 4 years ago
钮海涛 8c4bf4b0fe 修复导入excel大数据问题 4 years ago
yumingxing ca50493d20 报表20210125 4 years ago
puxiao.liao c8d97daa58 Fix bug#13248 4 years ago
puxiao.liao 983565aca1 Fix bug#13752 4 years ago
joke.wang 378993b225 包装条码补打优化 4 years ago
王杰 0183ca2a05 Merge remote-tracking branch 'i3plus-pojo/dev' into dev 4 years ago
陈思洁 85ebb5ce78 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 01877b80d5 【13614 19048 喷涂看板实际生产和计划数量都不正确 20210107】 4 years ago
Dominic_Xiao 81e63fe7d2 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao c5d56b2c32 炉内位置信息新增方向字段 4 years ago
wynne1005 665a89a8ae Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 5b2f57450b feat(core): 松下GID单点登录需求 
支持E9方式的SSo
 4 years ago
joke.wang 5d25ecc9b5 13829 mgn-bj 补打页面优化 4 years ago
钮海涛 fe0a83a8fe Merge remote-tracking branch 'origin/test' into test 4 years ago
钮海涛 1bc4c491b6 修改导入功能 4 years ago
许心洁 3cfa736132 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
王杰 fba7f636d9 状态机 4 years ago