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

2123 Commits (4921d55bda604b7334be48bcea9862edff365ea4)

Author SHA1 Message Date
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 6 years ago
汪云昊 47fb080742 lac线程超时监控优化 
Session超时时间参数化
lac添加TaskCheck
日志添加索引
 6 years ago
陈思洁 7d07580a78 合并冲突 6 years ago
陈思洁 b9844c255b 生产计划表结构增加 6 years ago
gcj 3e6ca8d039 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj a1a3d1e838 【Bug清单】------------------------------ 6 years ago
E c7d4253e5e 【bug 6872 - 收货、发运看板数据未加载】 6 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
zcg 032260b9f2 [需求：1290，导入excel] 6 years ago
曾贞一 10d8b9626f 冲突解决 6 years ago
曾贞一 cb6fe137d1 【bug6863 生产入库时-如果判断该条码未报工】 6 years ago
许心洁 49a126843b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 4fd9ec76f4 枚举漏提交 6 years ago
钮海涛 57b3b4242e 新增表达式录入界面接口 6 years ago
王杰 91730dd195 【需求：1277，关闭，暂停，完成工单 需要停线，做到方法可配】 6 years ago
jokelone d835ef1bb5 【任务：1273质量检测标准增加检测项类型】 6 years ago
jokelone a579358968 【任务：1257下线时间】 6 years ago
钮海涛 5e8e05ddb4 新增表达式录入界面接口 6 years ago
jokelone 690918add5 Merge branch 'dev' into test 6 years ago
曾贞一 1c9f605c56 【VDA成品发运配料-客户发往地】 6 years ago
王杰 5d57bc44d8 更新 'modules/i3plus-pojo-base/pom.xml' 6 years ago
王杰 cfa54aa2b6 修改pom 6 years ago
王杰 b9906cee55 增加枚举 6 years ago
jenkins d2591b419b Jenkins自动合并 6 years ago
许心洁 e4348cd334 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 fa8a88c6d0 流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中 6 years ago
陆卫豪 93126de988 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
gcj 1d0c03ba9c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
gcj a35171a41d 【采购收货】 6 years ago
jenkins f9d508d1ef Jenkins自动合并 6 years ago
qianhs 402b09e82e 【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】 6 years ago
王杰 338367f3c3 Merge branch 'dev' into test 6 years ago
钮海涛 64bfbb5013 新增甘特图工作块连线功能 6 years ago
jenkins 7630541146 Jenkins自动合并 6 years ago
jokelone 0e2b13d52f 【任务：1258枚举优化】 6 years ago
王杰 52f4854621 Merge branch 'dev' into test 6 years ago
王杰 99b66e459d 【需求：1221，导入】 6 years ago
王杰 5dd94058cf Merge branch 'dev' into test 6 years ago
王杰 f038ed7234 增加枚举 6 years ago
汪云昊 56381b76f1 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 db019bf4eb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jenkins d44d5d79ab Jenkins自动合并 6 years ago
汪云昊 26e7f975bf 数据源适配器支持IN 6 years ago
钮海涛 0dddbb936c 新增报表接口 6 years ago
汪云昊 f5a0f24355 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 f2c0c1206a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 3faa679cf9 Job测试 
新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口
 6 years ago
王杰 6da48220a5 Merge branch 'dev' into test 6 years ago
王杰 6959d126a0 增加枚举 6 years ago
crish 376700de0d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
钮海涛 d4f963ee70 新增报表接口 6 years ago
crish 74224b20ac 安灯主界面开发 6 years ago
陆卫豪 7556ada2d4 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9e64ee8258 【需求：1221，导入】 6 years ago
jenkins 8a34eee5c5 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone a49fdf87b8 【任务：1211报表质量数据】 6 years ago
陈思洁 d5ff3e4ce1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 54d3e351be 合并冲突 6 years ago
陆卫豪 5af777c4fd Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc b69bd1ae53 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ed89db8be3 6565 更新 同步流程 6 years ago
jenkins dcd36cb6e5 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
gcj af1324e9c7 【采购收货】 6 years ago
wei.peng 6d5fc7ab39 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 25cbbb5837 雪花ID 生成器 改为prop 配置 6 years ago
王杰 73b1e827d6 Merge branch 'dev' into test 6 years ago
王杰 1ab2c3605a 【需求：1221，导入】 6 years ago
王杰 e9055e3c5d Merge branch 'dev' into test 6 years ago
王杰 2893d13e9f 需求1221，导入 6 years ago
jenkins f6506bdd0b Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
曾贞一 ca6b596b14 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 47ccfcc9e3 【EU成品发运-检查数量组件】【bug1177】 
【EU成品发运-检查单据是否操作完成组件】【bug1176】
【EU成品发运-成品发运FIFO推荐组件】【bug1174】
 6 years ago
王杰 1d920627ec Merge branch 'dev' into test 6 years ago
钮海涛 5f3f973c3e 新增报表接口 6 years ago
王杰 a41c00f129 Merge branch 'dev' into test 6 years ago
jokelone 5bc9b9b082 【任务：1193字段类型修改】 6 years ago
王杰 dd0304d713 Merge branch 'dev' into test 6 years ago
jokelone 3eda200854 【bug：6545类型信息增加枚举】 6 years ago
王杰 09cf450156 Merge branch 'dev' into test 6 years ago
crish 4d3adf5daf Merge branch 'dev' into test 6 years ago
汪云昊 f0e77305dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 3856a6d600 LAC调整微服务指令集操作方式 
OPC UA工具订阅方式调整
 6 years ago
1111 f0290a758d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
1111 e349ab3e9b 【采购收货】 6 years ago
wei.peng 11bc240347 功能权限国际完成 6 years ago
crish 55ee26db3c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish f836daf8a6 将广播设备写死的代码配置化 6 years ago
陆卫豪 62800f757e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 185b40a586 6518 管控代码修改 6 years ago
钮海涛 bed955575d 修复规则组合关联问题 6 years ago
jenkins 04ae04246e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 07bda76d4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 b181cf2ac3 【安全库存拉动】 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
王杰 71d39f54d2 Merge branch 'dev' into test 6 years ago
王杰 c595d3f6b1 修改字段 6 years ago
陆卫豪 d6ff7aa2b1 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng 492367670b Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 59d6eb0727 添加系统配置接口 6 years ago
钮海涛 695ab094d2 修复资源表多选枚举显示问题。 6 years ago
钮海涛 89943f6586 修复资源表多选枚举显示问题。 6 years ago
qinjia zou 7a134dc0cb 【欧洲-生产快速入库】bug6389 6 years ago
jenkins 8eb8c2f97e Merge branch 'master' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9f9c095846 Merge branch 'dev' into test 6 years ago
汪云昊 c4ed0f1f37 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 12ba5d2ff3 lac微服务模式优化 6 years ago
王杰 a595fed4fe Merge branch 'test' 6 years ago
王杰 9baac06cb7 Merge branch 'dev' into test 6 years ago
王杰 e91369c82a 【需求：1198】 6 years ago
陆卫豪 0fad1e4df5 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 23b3ae88e5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 0e9b9b26fd 包装打印逻辑修改 6 years ago
jenkins e7bad502c3 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
1111 96ea008725 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 41a48b4b59 【采购收货】 采购收货 6 years ago
汪云昊 68f31721f0 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
qianhs d4422bee15 【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】 6 years ago
王杰 7a023d0f4b Merge branch 'dev' into test 6 years ago
王杰 3c3de49512 【bug:6483】 6 years ago
王杰 64d631c180 Merge branch 'test' 6 years ago
王杰 e5db689881 Merge branch 'dev' into test 6 years ago
王杰 85e35eede1 解决冲突 6 years ago
王杰 7f08847c50 Merge branch 'test' 6 years ago
王杰 6297ccc4d7 Merge branch 'dev' into test 6 years ago
jokelone 5e813f30e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone f632308d0a 【任务：1193接口数据解析】 6 years ago
王杰 2a5c32b8ea 解决冲突 6 years ago
陈思洁 5050c0c5a1 新增实体--安全库存 6 years ago
陆卫豪 4a76c480ac Merge branch 'test' of i3-IMPP/i3plus-pojo into master 6 years ago
陆卫豪 82fd56dc68 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc fdd051f2dd 打印修复 6 years ago
王杰 1a7164c474 Merge branch 'dev' into test 6 years ago
jokelone 9842ed2181 【任务：1193接口pojo】 6 years ago
crish 5b6b303722 Merge branch 'test' 6 years ago
crish 17d5f1e512 Merge branch 'dev' into test 6 years ago
王杰 2660e0268e 【需求：1198，代码优化】 6 years ago
crish 410558d43c Merge branch 'test' 6 years ago
曾贞一 7dbb55bcb0 【VDA质检】【缺了检验条码数量是否为-bug6402】 6 years ago
jenkins b5685a7874 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 6de87a1581 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 9969916e0a 开口合同 -关联单据类型 6 years ago
许心洁 3005beda46 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 4ad645d34e 流程管家新增触发源（放大镜80）+修改流程BUG#5826#5779+查询类型为可选列表的参数时没有加上软删条件 6 years ago
王杰 9137555226 Merge branch 'dev' into test 6 years ago
钮海涛 58b0f4a531 新增BOM树信息获取接口 6 years ago
jenkins 3d8421e1ec Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
于学杰 c3441184c0 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
汪云昊 8ff5d888c2 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 aab18be0e6 Lac细节优化 
OPC调整
 6 years ago
qianhs 137e473543 【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】 6 years ago
于学杰 b80a5b21ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 bcc7c282ca 1. 增加质检单生成类型 6 years ago
王杰 093008fae8 Merge branch 'dev' into test 6 years ago
jokelone 616d39fa38 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 246726a67d 【任务：1193 接口基础数据】 6 years ago
jenkins c1b50db526 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 49637cb23f 【需求:1167,批量打包】 6 years ago
汪云昊 d23303f07b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 60ec41e149 【采购收货】 6 years ago
jenkins a7b751d9dc Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
汪云昊 423d8d2c03 日志开关 
lac优化
OPC UA工具类
 6 years ago
crish 835ea47ba2 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish a30f4aae83 andon广播音量可配置， 安灯通知记录 6 years ago
jokelone 3eeaff50b3 【bug：5957工厂初始化】 6 years ago
puxiao.liao 75701682d2 【EU-生产报工撤销】【353生产报工撤销-4.1 处理报工撤销条码组件】【1191生产报工撤销-4.1 处理报工撤销条码组件】 6 years ago
许心洁 838b7ac311 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 cce413945d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 c1476f83c0 关闭任务 6 years ago
许心洁 003ed70f98 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc b595d76056 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 45d14fe3e2 枚举增加 生产模式参数 6823 6 years ago
许心洁 ed7e002f6d Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 7678b95aaa Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish a294c1ccb0 安灯看板超时统计功能 6 years ago
qianhs 6536109b66 【 EU编组管理】【 334- EU编组管理-组件和函数复用】【1172EU编组管理-组件和函数复用】 6 years ago
王杰 71bde083a3 Merge branch 'dev' into test 6 years ago
陈思洁 9b491b742e 业务类型枚举维护 6 years ago
许心洁 60c25d7a71 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 ccb29c5903 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 f5c8e36ac9 【需求：1189，产品条码工步】 6 years ago
王杰 bcf3866ca6 Merge branch 'dev' into test 6 years ago
许心洁 208410340e Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
qianhs 1453a3d49b 【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】 6 years ago
王杰 ab34ebb769 Merge branch 'dev' into test 6 years ago
陈思洁 3b235acda0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 31e24390dd 合并冲突 6 years ago
WYnneaoapc c93dd66cd9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 7b88c605ba 枚举修改 1060 6 years ago
陈思洁 99947f284e 枚举修改--移动业务类型 6 years ago
qianhs 62bb71f4b0 【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】 6 years ago
张哲铭 578be0650a Merge branch 'dev' into test 6 years ago
wei.peng 43e400d354 数据映射类型 更改BigDecimal 6 years ago
1111 db952282e0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 7378df1b9e 【宁德问题清单】 6 years ago
许心洁 b6e27c33c8 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone a04b8f7c57 【bug：5791 生产工单明细1】 6 years ago
jokelone 5fd619ac79 【bug：5791生产工单明细】 6 years ago
王杰 75e7aa30c2 Merge branch 'dev' into test 6 years ago
王杰 84bf5ba64a 【需求：1162，pcn登陆】 6 years ago
陈思洁 04e876250b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 58c9795b7c 移动类型、业务类型维护数据 6 years ago
王杰 acaacf63a3 Merge branch 'dev' into test 6 years ago
WYnneaoapc 56e6cf7918 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
 6 years ago
张哲铭 6871e96496 Merge branch 'dev' into test 6 years ago
1111 88a69ac7f8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 71c867dd8c 【包装规格】 6 years ago
许心洁 ac43296df3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5dc8ffb394 日志处理队列V1.0 6 years ago
王杰 bc14fcf027 Merge branch 'dev' into test 6 years ago
汪云昊 eeebbfd1fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 759f9ee819 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 e26dadca01 【需求：1162，pcn登陆】 6 years ago
汪云昊 dcbb6a7a1c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 053b3ae0e4 LAC 前端联调调整 6 years ago
alwaysfrin da582b871d 日志处理优化 6 years ago
crish c4d7a2380c Merge branch 'test' 6 years ago
张哲铭 efbe0dfce9 Merge remote-tracking branch 'origin/dev' into test 6 years ago
lpx fc79b1b0f3 【扫描查询】【308扫描查询-4.2增加处理查询结果组件】【1132扫描查询-4.2增加处理查询结果组件】 6 years ago
WYnneaoapc 029c9b6bc8 代码审核 修改1 6 years ago
许心洁 970105ac19 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone b6d7156b0b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 9a6c5cfda3 【任务：1163客户订单】 6 years ago
王杰 b2886012a5 【需求id：1162，pcn登陆】 6 years ago
许心洁 e433915759 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
qianhs c68cb7889e 【VDA物料拆分-输入数量-数量检验】【6233】 6 years ago
曾贞一 c2d3e044fb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 be75c4ec42 【VDA质检--物料信息维护】任务号1135 
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
 6 years ago
陆卫豪 64be0c721c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 4b47ceb42d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 3b447fa77a 数据抽取修改 1130 6 years ago
jokelone 9418a0838b 【任务：1129 产品编码配置基础数据】 6 years ago
陆卫豪 46fc5f5750 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 90ec0f107e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 32dbaed8fe 【任务：1129数据对象、对象结构、产品包装关系基础数据】 6 years ago
王杰 d2c7a81893 Merge branch 'dev' into test 6 years ago
WYnneaoapc 855cc46448 数据抽取修改 1116 6 years ago
陆卫豪 07a80e7fd2 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 46e0488d5a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1de5b8b196 数据抽取修改 1116 6 years ago
crish 851ba63e7c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish f111febd8d 修改“其他”安灯类型的名字为“自处理”， 统一修改获取组织代码的方法 6 years ago
wei.peng 3645368544 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng b963bcb502 LAC 日志处理功能完成 6 years ago
许心洁 219bf6db9a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
qianhs 457e10bc75 1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】 6 years ago
许心洁 04453aa706 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
gaochangjiang 047b9d5e35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gaochangjiang 02e3ac4960 【库存预警】bug 修复库存预警 6 years ago
王杰 a95b6baae1 Merge branch 'dev' into test 6 years ago
jokelone 828cf66784 【需求：1090 工序BOM，物料绑定记录删除多余字段】 6 years ago
王杰 dfec2532cb Merge branch 'dev' into test 6 years ago
lpx 69be002972 【装箱防错】【301-4.2条码装箱防错】【1118条码装箱防错建任务】 6 years ago
王杰 7291a7a85c Merge branch 'dev' into test 6 years ago
汪云昊 86a18d730a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9907813aed Lac调度实体 6 years ago
许心洁 c9f26c22c1 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 bbec6a1002 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7799937093 成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除 6 years ago
王杰 1846c6f4f8 Merge branch 'dev' into test 6 years ago
jokelone 438517be44 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
 6 years ago
jokelone 6c847cf305 【需求：1091 返厂返修添加字段和枚举】 6 years ago
王杰 2069d6a3ae 【需求：1125，设备报表】 6 years ago
王杰 9446a76159 Merge branch 'dev' into test 6 years ago
wei.peng f67a61ec92 网关 添加 APS 路由 
BASE URL 路径优化
 6 years ago
王杰 42ec1b3693 Merge branch 'dev' into test 6 years ago
王杰 dcaf007f4d 【需求：1107，生产工单首检件】 6 years ago
王杰 35cf3cf162 Merge branch 'dev' into test 6 years ago
jokelone bc13a8a3ac 【需求：1090 返厂返修增加分页查询】 6 years ago
许心洁 c79786a677 合并开发分支的代码POM文件被改成DEV修改回TEST 6 years ago
jokelone a5609d97fb 【1092 返厂返修增加枚举】 6 years ago
crish 18161e8191 Merge branch 'test' 6 years ago
crish 67461457fc Merge branch 'dev' into test 6 years ago
crish 1e0f0c706c 安灯问题修复 6 years ago
crish f093a97cf0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 4eaa8b5b17 导入导出 6 years ago
crish 6902c79472 问题清单问题修复 6 years ago
crish 7d8b8664cc 问题清单问题修复 6 years ago
王杰 56996126be 【需求：1101，mes同步设备安灯维修任务】 6 years ago
许心洁 73aef5326c Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone d0b98f0869 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 00e849a62e (1089 过程质量检测基础数据；1090 返厂返修基础数据) 6 years ago
许心洁 3bc277178e Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish e15e402890 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
许心洁 0c20a2b655 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lpx ca0cf21a7c 【NC解冻-4.2 组件复用】PR12-01~PR12-02 6 years ago
crish a537daee62 导出不导出有效性 6 years ago
qianhs caf6dc17ab 【NC冻结】nc冻结 6 years ago
许心洁 44fccb14d6 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 09cff08e1e [需求1086，设备点检保养作业，第2次提交] 6 years ago
许心洁 d5864ba490 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng 5e78c31a70 LAC 名称修改 6 years ago
crish 15e812c7a6 Merge branch 'test' 6 years ago
陆卫豪 9558225174 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 87ffdfd9a3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ac7b0415ba 1083 添加枚举字段 6 years ago
汪云昊 5c67a7bb5f MySQL 数据库不支持 CAST AS DOUBLE，需要改成 CAST AS DECIMAL 6 years ago
crish 0526da8ee3 Merge branch 'test' 6 years ago
crish cd74f5336f Merge branch 'dev' into test 6 years ago
王杰 fa25769c50 mes枚举 6 years ago
刘辉 e89df89f9a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 0d0178545c mes设备 6 years ago
WYnneaoapc e8336c85d7 idea 异常 文件格式化 6 years ago
jokelone 7139d9b5f1 解决冲突 6 years ago
jokelone 9e4930968f 解决冲突 6 years ago
jokelone 8a517bc0b9 返厂返修增加字段 6 years ago
刘辉 febbea09c3 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
crish 0fdabe4950 知识库 ，自处理开发 6 years ago
crish 1de89d732b 本地误拉了test代码，解决pom 6 years ago
crish 9f9874902d 冲突解决 6 years ago
曾贞一 e603ac66a7 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 5a036f14cb mes设备作业任务 6 years ago
jokelone 7fc439319e 返厂返修 6 years ago
陆卫豪 413266293e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 030391a93c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 56d7457826 工位监控提交 6 years ago
曾贞一 5e7fb00d0c 【生产领料】 6 years ago
许心洁 1f1b4f7511 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 48a6cdc39c 作业任务：作业类型 枚举增加 6 years ago
crish e260045c42 Merge remote-tracking branch 'origin/test' into test 6 years ago
crish 97763d6b53 安灯广播， 安灯管理显示不同界面， 添加操作来源字段 6 years ago
王杰 b561110e54 Merge branch 'dev' into test 6 years ago
王杰 9cc89f9397 mes设备周期计划 6 years ago
许心洁 2f843a8f5a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 986157043d 流程设计：新增组件参数类型：可配字符串 6 years ago
王杰 611b25abfd Merge branch 'dev' into test 6 years ago
汪云昊 d91fa61c88 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 6c1891c193 软适配报文状态及微服务接口调整 6 years ago
wei.peng 05fd0fe686 WebService Server 优化完成 6 years ago
许心洁 7863325afd 本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原 6 years ago
许心洁 b7b78b85ac 误拉了test分支的代码：还原 6 years ago
许心洁 d351c36ffc Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc c681340355 工位监控添加枚举一字段 6 years ago
汪云昊 52a5fe74af Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 029f14d36f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java
 6 years ago
刘辉 83a7a9e988 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng d9dd10761e WebService 欧洲对接完成 6 years ago
王杰 2ed8ebdbd7 Merge branch 'dev' into test 6 years ago
changjiang.gao 0e7c7fbfb2 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
changjiang.gao 45b4264c67 导出显示bug修改 6 years ago
jokelone 1758a4e50e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago