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

1855 Commits (779b9d209ce032c313210bf54ddc1b4bea3c6c97)

Author SHA1 Message Date
王杰 bf71cd07d0 JIS发运 5 years ago
jenkins 134757c92b Jenkins自动合并 5 years ago
wei.peng 32d715a29c APS 调用失败bug 修复 
动态报表 下拉问题修复
 5 years ago
宋军超 964afe73cd 2020-01-16 16:42 添加自定义列枚举 5 years ago
宋军超 851067b8d2 2020-01-16 16:37 自定义列表优化 5 years ago
jenkins d790bcf355 Jenkins自动合并 5 years ago
袁津哲 67ef5c5516 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 89a7cafee4 Wms动态搜索与自定义列表，表单开发 5 years ago
jenkins 33e68b7e9f Jenkins自动合并 5 years ago
wei.peng cb68f62e46 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng 8a4974f369 自定义报表 调用调整 5 years ago
jenkins 6371e8df60 Jenkins自动合并 5 years ago
袁津哲 f7c98e3982 Wms动态搜索与自定义列表，表单开发 5 years ago
jenkins 69ff58a67e Jenkins自动合并 5 years ago
qianhs 61303a9f38 【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】 5 years ago
jenkins 002ce795f4 Jenkins自动合并 5 years ago
luweihao 01a694be70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 6baeeee71e task `1392` 调整工步 错误处理实现 5 years ago
jenkins 458137d216 Jenkins自动合并 5 years ago
许心洁 fff79a7846 GROUP_COMMIT_MODE枚举漏提交 5 years ago
许心洁 0e54d9a5b6 任务#1403 流程isCommitRefMove属性改为commitMode 5 years ago
jenkins c1609539cf Jenkins自动合并 5 years ago
许心洁 de0d57179c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 35839db806 BUG#7359 任务列表分组字段和移动单赋值逻辑更改 5 years ago
jenkins 8f6b53c5ea Jenkins自动合并 5 years ago
wei.peng 3e31641b20 PTL 项目初始化 
PTL PCN 项目初始化
 5 years ago
jenkins a0b67a3723 Jenkins自动合并 5 years ago
袁津哲 8285c87624 Wms动态搜索与自定义列表，表单开发 5 years ago
jenkins 7057c685cc Jenkins自动合并 5 years ago
zcg 2396863bab 【任务:1383 数据监听定时数据抓取】 5 years ago
jenkins 64438ac61c Jenkins自动合并 5 years ago
qianhs 41047a17c1 【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】 5 years ago
jenkins 8e168c5109 Jenkins自动合并 5 years ago
wei.peng 503f3cd7a3 自定义表单功能优化 5 years ago
曾贞一 5c841c706b 【7201 收货BOP移库流程图】 5 years ago
jenkins 56e53906ec Jenkins自动合并 5 years ago
jokelone f1096e9ec5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 51839d7be5 【任务：1381】 5 years ago
zcg add40a27e3 【任务：1382，数据监听基础模块开发】 5 years ago
汪云昊 536200cf2b Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
gcj cbe87c6bd7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj c14d6c6916 【宁德问题清单】 5 years ago
袁津哲 7d4ba10449 Wms初始化扫描实体字段新增逻辑优化 5 years ago
jenkins 75dc17f4c4 Jenkins自动合并 5 years ago
jokelone d0cd9d03b9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 0d7aca73a8 【需求：7315 生产工单变更】 5 years ago
王杰 54bdf8f6a0 JIS 5 years ago
e-jiawentao1 9fbc120666 动态搜索与自定义列表初始化扫描Bean字段 5 years ago
王杰 685d7949bf Merge branch 'dev' into test 5 years ago
zcg b84a305b26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 497b963f60 Jenkins自动合并 5 years ago
王杰 bf62494236 JIS 5 years ago
jenkins fa4cc8610f Jenkins自动合并 5 years ago
puxiao.liao 8584946ce5 【 条码状态报表，导出时下列三个字段为中文 
】bug7196
 5 years ago
zcg c86f3e280e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 f88041df1e Merge branch 'dev' into test 5 years ago
王杰 3fe50125ae JIS 5 years ago
jokelone c226e61acf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg d9990f0cb8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng 823f818abf Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
wei.peng 44af186f2f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng af6083ddff 日志存储优化 5 years ago
jokelone 68eb60c6cb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg f38e54e496 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 422aa1835f Jenkins自动合并 5 years ago
钮海涛 4013ed776b 修复炉资源排程问题 5 years ago
jenkins dfb06def2b Jenkins自动合并 5 years ago
曾贞一 9e9d3e2afa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 5a4510cedb 【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】 5 years ago
qianhs 81bab75132 【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】 5 years ago
WYnneaoapc adb4bd2a1c Merge branch 'dev' into test 5 years ago
许心洁 7594b3d515 SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消 5 years ago
jenkins 688d976683 Jenkins自动合并 5 years ago
王杰 8a4aa9fed2 jis发运 5 years ago
jokelone ebe34e4ba9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg ad08ff21bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 569c2613fe Merge branch 'dev' into test 5 years ago
wei.peng f768247c4f 代码合并 2019-12-30 15:59:52 5 years ago
jokelone 39790fd50b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone d47a097c53 【任务：1344 通用接口增加批量数据处理】 5 years ago
zcg 1230906c3e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng 3b7b374b23 自定报表对象模型调整 5 years ago
汪云昊 b12f67e34b Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 6b02d9969a 数据源批量写入优化 5 years ago
王杰 7287aaeb77 其他组未提交的代码 5 years ago
jenkins 471016b345 Jenkins自动合并 5 years ago
汪云昊 20ccf65c5c 资源加载优化 5 years ago
汪云昊 d89ed44bcc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 1d9ab80ae8 数据源适配器 - 批量写入优化 5 years ago
zcg 192034152b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 3ddadad142 Merge branch 'dev' into test 5 years ago
王杰 019cb91a4c 【需求：1329】 5 years ago
zcg dbe2d32bb6 [需求：1322，枚举修改] 5 years ago
王杰 91ab421d5e Merge branch 'dev' into test 5 years ago
jokelone f857a4065d 【任务：1327JIT生产】 5 years ago
E e5452056b6 【bug7083 KT器具管理】新增业务类型和作业类型 5 years ago
puxiao.liao 794992d687 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 734b54d1b2 【 领料上线扫描时，在扫描完条码后将目标库位带出。 
】bug7024
 5 years ago
王杰 06afd98334 Merge branch 'dev' into test 5 years ago
jokelone 0e84990f3c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 20f6961daf 【任务：1327JIT生产】 5 years ago
jenkins 6a19a07fce Jenkins自动合并 5 years ago
汪云昊 d5c1f7a7a3 资源模块数据 
模板软删除
软适配list传参
 5 years ago
jenkins 1fbd9c4357 Jenkins自动合并 5 years ago
zcg dccd104fdd [需求：1324，excel导出] 5 years ago
jenkins 4e8ee475b4 Jenkins自动合并 5 years ago
gcj 99eaa8b8ca Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
 5 years ago
gcj fc9b8629ab 【采购收货】 5 years ago
jenkins cc45dbc2cb Jenkins自动合并 5 years ago
E 996526ac7c 【bug7088 物料信息中的导入功能】 5 years ago
王杰 90de0f7df6 Merge branch 'dev' into test 5 years ago
王杰 b0709aca97 枚举 5 years ago
王杰 ab68895760 test分支修改pom 5 years ago
王杰 c87b00756f dev分支修改pom 5 years ago
qianhs a2ac02aa47 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 5 years ago
E 7ef04dd824 【1320 KT物料信息--需要维护物料的类型：器具】 5 years ago
gcj a7d1ec785b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
qianhs 5c28c8344c 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 5 years ago
汪云昊 4705b77a7e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 b674087ffc 资源导入优化 5 years ago
王杰 339f1a86c2 删除枚举代码中间的注释 5 years ago
puxiao.liao 0453363336 【发运配料界面显示将单据数量改为剩余配料数量。 
】bug7063
 5 years ago
jokelone e2c9d9e569 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 54fe0ce760 【bug：6360 工厂初始化】 5 years ago
gcj 49134cc5b3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 81b84d86e5 新增KPI接口 5 years ago
WYnneaoapc 0191a17a4d Merge branch 'dev' into test 5 years ago
WYnneaoapc 0103c64247 task `1316` 1 拆分job任务 5 years ago
WYnneaoapc e206057aba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 5513e95884 Jenkins自动合并 5 years ago
gcj 01e5919349 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
E b5006a88f1 【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】 5 years ago
WYnneaoapc 50f77a5081 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 0e1599789d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj d92850c1a4 【运输管理】 5 years ago
WYnneaoapc a38dc051ac task `1308` 1 PCN国际化资源 5 years ago
jenkins 03051f4fd1 Jenkins自动合并 5 years ago
许心洁 773f56b577 TASK_INO_STATUS 20和30的枚举类名严重错误，容易误导开发 5 years ago
汪云昊 1318c6ef56 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
WYnneaoapc 129c84d4a8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc bc21d0b461 task `1308` 1 PCN国际化资源 5 years ago
陈思洁 5d4e8a94c4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 c5ae91b41e 【KT-1286 计划拉动-计划拉动JOB】 5 years ago
jenkins 55dcb795c9 Jenkins自动合并 5 years ago
许心洁 e816c2fd6a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 258c1ccbe8 流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库 5 years ago
jenkins 1594c49ca9 Jenkins自动合并 5 years ago
zcg f23b0f7bfe 解决冲突 5 years ago
陆卫豪 3e9c1aaa76 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
WYnneaoapc 7451bc9460 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into wynne_temp_wc 5 years ago
WYnneaoapc 99fd4221e2 task `1304` 1 活化开线管控 5 years ago
jenkins 350f7101d2 Jenkins自动合并 5 years ago
jokelone f3756e6b34 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone b9b30cf19c 【任务：1306质量标准配置】 5 years ago
WYnneaoapc b3a04911b6 task `1300` 5 BI 产线运行情况 5 years ago
陆卫豪 5393d6e034 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
zcg 586dfb416b [mes枚举修改] 5 years ago
陈思洁 40c64db0b1 冲突 5 years ago
陈思洁 ee14ce1d4b 【KT-快速入库功能】 5 years ago
jenkins 015d284239 Jenkins自动合并 5 years ago
puxiao.liao 99a1ec309d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao 3bfb0995d5 【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位 
】bug1299
 5 years ago
王杰 c4c615bd15 Merge branch 'dev' into test 5 years ago
王杰 3ff9fbc140 安灯图表 5 years ago
WYnneaoapc b088b40fd1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc a1a602e457 task `1300` 5 BI 产线运行情况 5 years ago
jokelone 6995189893 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 46ec9e51b0 【任务：1211报表导出冗余字段】 5 years ago
jokelone 874fd139dc Merge branch 'dev' into test 5 years ago
E 59bdec9c6f 【6933 收货看板容器未收货时，看板收货状态为收货完成】修改收货看板枚举 5 years ago
WYnneaoapc ef34a13313 task `1300` 2 BI 产线运行情况 5 years ago
WYnneaoapc e3d84dd48f 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/MesEnumUtil.java
 5 years ago
WYnneaoapc b2daf9fd9c task `1300` 1 BI 产线运行情况 5 years ago
zcg d6975bf5de Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg ccfba0fe56 mes枚举修改 5 years ago
jokelone 0dfb948810 Merge branch 'dev' into test 5 years ago
jokelone 519d985838 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 0acf17ddd7 【1211：报表1】 5 years ago
许心洁 927579aca5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 fc663ee283 作业流程导入导出BUG#6189 5 years ago
gcj a6bb80a5a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 2e98e17a05 【运输管理】 5 years ago
zcg 7016f20282 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg 7bf8534c16 mes枚举 5 years ago
汪云昊 03d432993a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 47fb080742 lac线程超时监控优化 
Session超时时间参数化
lac添加TaskCheck
日志添加索引
 5 years ago
陈思洁 7d07580a78 合并冲突 5 years ago
陈思洁 b9844c255b 生产计划表结构增加 5 years ago
gcj 3e6ca8d039 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj a1a3d1e838 【Bug清单】------------------------------ 5 years ago
E c7d4253e5e 【bug 6872 - 收货、发运看板数据未加载】 5 years ago
王杰 1f4a8d6e55 【安灯修改枚举】 6 years ago
jokelone a337f1824f Merge branch 'dev' into test 6 years ago
gcj 32dccc056c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
 6 years ago
gcj 1e10bdee0c 【坤泰运输管理】 6 years ago
WYnneaoapc fc5282342f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ca952d5211 bug`6866` 2 打印模板同步 6 years ago
jokelone 056dbaacf2 Merge branch 'dev' into test 6 years ago
王杰 fcc2b09559 【安灯修改枚举】 6 years ago
WYnneaoapc f4b50200b2 bug`6866` 1 打印模板同步 6 years ago