5928 Commits (eaecf4b4b73c657e4af1061e3d99ff1413f5df6c)
 

Author SHA1 Message Date
王杰 da1c10dc4c mes生产计划批量编制 5 years ago
曾贞一 fb15536a34 【8254 中航-出库单-客户发运-新增销售订单字段】 5 years ago
曾贞一 e6f8811f72 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 cf12f354ae [8206 生产工单-导入失败] 5 years ago
钮海涛 7aaed8fb79 task:1735 5 years ago
joke.wang de7d007ef1 [获取工步sql server分组函数问题修复] 5 years ago
钮海涛 ac9ffb1ac1 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
陈思洁 ad8255949a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 be925fded9 【1693-设备状态监控看板】 5 years ago
袁津哲 000c2ad16c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 745455c5bd 修改波次规则bug和对接导入模板接口 5 years ago
钮海涛 bf2cc9843f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
5 years ago
puxiao.liao b9af2c52f8 1713 BH-挑选,返修 5 years ago
钮海涛 81f380aec4 产品入库表新增 5 years ago
joke.wang 60428b5bad [任务:1690 界面窗口] 5 years ago
钮海涛 b7dceccd71 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f414274aeb 供货追踪 5 years ago
陈思洁 22b42d710b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ff6e5ac926 【8239 生产作业-单产品扫描(数据写入有误)】 5 years ago
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
陈思洁 a8ae48b132 【7937 半成品箱条码绑定工步-数据写入缺少】 5 years ago
汪云昊 30c0b2e46a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 d4a91b6d69 缺失资源接口优化 5 years ago
许心洁 1a7d9edd40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 3cd2fb02f4 宁德BUG-JIS发运汇总JOB:BUG#8246 5 years ago
汪云昊 241ea78cda 检测环境枚举数据调整 5 years ago
汪云昊 71d30c3232 表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展
表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化
5 years ago
王杰 3660418497 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev 5 years ago
王杰 2b01efb15b mes生产计划批量编制 5 years ago
wynne1005 d5f69eeefd task 1565 发运修改 5 years ago
曾贞一 d29a26c73f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 8e529f46d7 【1722 BH-Bacth条码查询】 5 years ago
宋军超 92c13e5bcd 添加人员技能功能 5 years ago
袁津哲 64daf36410 动态搜索修改人修改时间开窗处理,BUG:8097 5 years ago
袁津哲 633aef2d6e 动态搜索修改人修改时间开窗处理 5 years ago
wei.peng 37922cab29 POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
5 years ago
wei.peng fe94ad9bf3 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
wei.peng 8aab106aa9 合并代码 pom 冲突
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
5 years ago
wei.peng 279ec2d1fe 授权加密问题修复 5 years ago
宋军超 b96eb1b669 添加人员技能功能 5 years ago
陈思洁 2c50fceec9 【1693-设备状态监控看板】 5 years ago
陈思洁 87664b96cb 【合并冲突】 5 years ago
陈思洁 abd974f54f 【1693-设备状态监控看板】 5 years ago
钮海涛 724ba402bf 前端联调 5 years ago
曾贞一 bc82c85790 【1721 BH-BH检测结果管理】 5 years ago
袁津哲 5ba022c21a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 b23915236b 开发根据实体动态生成数据库文档页面功能 5 years ago
钮海涛 60580e5ad9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 cb8688105c task:1727;1728;1729 5 years ago
王杰 e9afe5a943 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev 5 years ago