6551 Commits (4d816de5da921800247d4f6864a7229ff7fe0131)

Author SHA1 Message Date
王杰 1707f6b228 MesProdWorkCenter 5 years ago
陈思洁 3baf748329 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9b9871534a 【10493 19048-产品颜色无导入功能】 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
joke.wang a522db04a9 过程条码增加字段vinCode 5 years ago
宋军超 84f61e65fc 修改海纳川问题 5 years ago
王杰 18dd2cbcb2 zs 5 years ago
汪云昊 b4c90b01fa Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 8d17cfcec0 feat:用户定制化配置功能 5 years ago
王杰 772229b983 andon 5 years ago
王杰 9e8cb0b844 注塑 5 years ago
陈思洁 056d4390ca Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 4a99857248 【10414 19048 - 注塑产品消耗BOM报表!-2020-08-05】 5 years ago
joke.wang 8c2fd8a587 Fix Bug #10476 5 years ago
joke.wang f495ffed54 Fix Bug #10477 5 years ago
joke.wang 4bdd2b770b Fix Bug #10486 5 years ago
joke.wang 51f9d92d36 北京麦格纳esop展示组件修改 5 years ago
ypf 97a2bdd60e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
ypf 523d2ffc80 关于欧洲领料看板逻辑实体的添加 5 years ago
joke.wang 7c3594a870 Fix Bug #9589 5 years ago
陈思洁 e4c8431a22 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 653b413623 【10334 19048-MES、WMS接口JIT02中增加内部工单号!-2020-08-03】 5 years ago
宋军超 e70192d3c2 添加日志查询问题 5 years ago
钮海涛 54b0af00cc Sweb功能开发 5 years ago
宋军超 625b780aaf 添加海纳川数据复核工步和产线状态看板变更 5 years ago
wynne1005 5d9e055fe1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3af4d32a97 mes工位运行状态 5 years ago
汪云昊 a3e8caf085 fix:detachObject为空时报错 5 years ago
宋军超 6aaa26b192 修改海纳川问题 5 years ago
joke.wang edb85b5ea6 桌面BI 5 years ago
汪云昊 55b047448b fix:会话模式为默认时出现不能正常覆盖的问题 5 years ago
宋军超 6e60bee0dd 修改海纳川问题 5 years ago
宋军超 731b1c60ee 修改海纳川问题 5 years ago
wynne1005 3c004324b1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6e455f5d72 reqBean 添加productSn 5 years ago
王杰 5413fc259c pcn 缺陷 5 years ago
许心洁 4a9e5cbb59 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 3a4c143563 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 14e68803df 增加根据物料号取库存地信息的微服务接口 5 years ago
许心洁 afeb22c8ec Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 7dcd8a1627 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 7482a6dd74 BUG#9928 和任务#2590 5 years ago
汪云昊 410f469450 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 7f291a26cd 会话模式配置-调整默认模式 5 years ago
puxiao.liao f9061f5d27 BUG修复 5 years ago
宋军超 162e2d33d7 修改海纳川问题 5 years ago
宋军超 99787412cd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 8eade912c7 添加返工返修数据复核逻辑 5 years ago
陈思洁 ed343a8064 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ba3f5fde4d 【总装、涂装、注塑计划报表】 5 years ago
qianhs 86c9bce2aa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 c4f40d215b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 fa4b1e09aa 修改海纳川问题 5 years ago
曾贞一 067a859e83 【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】 5 years ago
钮海涛 933f2014ad Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 59a1acdafc 修复合并版本问题 5 years ago
puxiao.liao d5d16569bb Fix bug#10283
20089+库存移动统计报表查询增加项目代码查询项
5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
宋军超 fe79944778 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 5739ac27bb 缺陷 5 years ago
陈思洁 39ea32e37e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a01cd4d34b 【注塑计划导入功能数据优化】 5 years ago
宋军超 8bc0da924c 修改海纳川问题 5 years ago
rock.yu f368ec88cc 修改流程管家组件调用日志表 5 years ago
joke.wang 33cace48ab 半成品打印增加字段 5 years ago
qianhs c872663847 Finish Task #2080 Cost:8h 5 years ago
宋军超 0b3c53b4ca 修改海纳川问题 5 years ago
wynne1005 e35fdcbc2a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c9cdcb6a0 tmp 5 years ago
rock.yu 71a2b68991 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu b928acae47 1. 流程管家增加记录组件执行耗时的功能 5 years ago
陈思洁 b662a6ebe5 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 26fe63eb8a 【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】 5 years ago
汪云昊 e6ecd4f86f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 0d40470059 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 18a09cc4b6 FTP多文件读取问题
脚本解析功能初版
5 years ago
汪云昊 101a71970c 虚拟属性数据校验及参数赋值问题 5 years ago
汪云昊 5a6a7a77fc 平台功能优化,移除通用缓存服务 5 years ago
钮海涛 51bae8d1e6 Fix Bug #10312 修复动态搜索取不到列信息问题 5 years ago
王杰 9a959a5184 pcn enum 5 years ago
陈思洁 41cbe4f380 【10284 19048-注塑生产计划导入变更-20200803】 5 years ago
陈思洁 ce7ca48c4b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 394a332de2 修改展示组件逻辑 5 years ago
陈思洁 72c8e22433 【接口映射代码调试】 5 years ago
wynne1005 88233f080a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3ec8109e82 枪优化 5 years ago
王杰 e8611616db IPC 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
joke.wang c060377822 中航BI 5 years ago
wynne1005 5fad38392e 添加索引 脚本表更新 5 years ago
joke.wang 05fa7dba04 Fix Bug #10227 5 years ago
joke.wang af539c85a7 mgn bug 5 years ago
宋军超 31f289e1be 修改展示组件和电检逻辑 5 years ago
曾贞一 f25a186d77 【2511 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
曾贞一 4ff84de904 【2557 sap指令锁定回传信息增加业务类型,交易类型,erp单号内容】 5 years ago
puxiao.liao 5990e56dfd Finish Task #2540 Cost:8h
喜德WMS-新增“回传源材料扣减结果”的接口映射
5 years ago
王杰 bc9adf8ac0 ptl 5 years ago
王杰 784cd87c71 ptl 5 years ago
钮海涛 e239c89e63 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
5 years ago