 钮海涛
|
ac9ffb1ac1
|
Merge remote-tracking branch 'origin/dev' into dev
|
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 |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
30c0b2e46a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
241ea78cda
|
检测环境枚举数据调整
|
5 years ago |
|
汪云昊
|
71d30c3232
|
表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展
表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化
|
5 years ago |
 王杰
|
2b01efb15b
|
mes生产计划批量编制
|
5 years ago |
wynne1005
|
d5f69eeefd
|
task 1565 发运修改
|
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 |
宋军超
|
b96eb1b669
|
添加人员技能功能
|
5 years ago |
 曾贞一
|
bc82c85790
|
【1721 BH-BH检测结果管理】
|
5 years ago |
|
钮海涛
|
cb8688105c
|
task:1727;1728;1729
|
5 years ago |
|
钮海涛
|
3fbf532c84
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2cc43af431
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
|
joke.wang
|
ce1dd45842
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
755fccb45e
|
[任务：1690 产能监控看板]
|
5 years ago |
qianhs
|
2303186fc4
|
【657】【中航WMS看板－成品发运率看板】
【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】
|
5 years ago |
|
puxiao.liao
|
f6988f36c8
|
1655 生产领料单增加替代料
|
5 years ago |
|
wei.peng
|
3aa1afb0ce
|
对象历史记录 Pojo 创建
|
5 years ago |
|
wei.peng
|
fee90baf64
|
1. 关闭register , gateway , console 日志持久化技术
2. Sonar Bug 修复
3. 自定义日志持久化
|
5 years ago |
|
joke.wang
|
e6f3dd5c32
|
[任务：1683-看板管理]
|
5 years ago |
|
袁津哲
|
7789883f9b
|
开发导入功能模块
|
5 years ago |
|
钮海涛
|
a597d78100
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
c57ca73a4a
|
bug:8169;8176;8177
|
5 years ago |
|
wei.peng
|
effae233bf
|
对象历史记录 Pojo 创建
|
5 years ago |
|
wei.peng
|
dac1358009
|
1. 关闭register , gateway , console 日志持久化技术
2. Sonar Bug 修复
3. 自定义日志持久化
|
5 years ago |
|
joke.wang
|
4e02acb9e3
|
[任务：1683-看板管理]
|
5 years ago |
|
袁津哲
|
8a6c9aadef
|
开发导入功能模块
|
5 years ago |
|
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
5 years ago |
|
qianhs
|
0a2d9a3d6d
|
【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】
|
5 years ago |
|
袁津哲
|
9518628c12
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
533d8e55e8
|
开发导入模块功能
|
5 years ago |
|
王杰
|
d4bde19861
|
mes
|
5 years ago |
|
王杰
|
74a4a1381c
|
mes
|
5 years ago |
|
汪云昊
|
ccf2f42840
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
edf0b66115
|
Sonar代码缺陷修复
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
|
5 years ago |
|
汪云昊
|
baaf16ad56
|
国际化工具类异常处理优化
|
5 years ago |
陈思洁
|
5d8fec4938
|
合并冲突
|
5 years ago |
|
陈思洁
|
7505087392
|
【mes 产品配方导入功能和基础数据维护】
|
5 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
|
宋军超
|
e464b4d699
|
删除设备备件管理相关实体
|
5 years ago |
|
宋军超
|
89a9946432
|
添加设备管理相关功能
|
5 years ago |
|
王杰
|
cba7ee3d0d
|
[任务：1522，ptl流程设计]
|
5 years ago |
|
qianhs
|
88279f9b8b
|
sonar bug修改
|
5 years ago |
|
曾贞一
|
e5c275499c
|
【冲突解决】
|
5 years ago |
|
曾贞一
|
255aefbcef
|
【1585 销售订单管理-销售订单维护】
|
5 years ago |
|
钮海涛
|
e9ec4cecfe
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
00fce0bded
|
新增客户物料发往地
|
5 years ago |
|
wynne1005
|
0e934f9af6
|
task `1565` 发运enum
|
5 years ago |
|
汪云昊
|
f09159dffa
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
01d3eeea51
|
新增客户物料发往地
|
5 years ago |
|
钮海涛
|
dd9ae231c8
|
与界面联调物料扩展属性
|
5 years ago |
|
wynne1005
|
cc739eac24
|
task `1565` 发运pojo
|
5 years ago |
|
汪云昊
|
1051b22575
|
ICS 注册中心监控对象
|
5 years ago |
|
宋军超
|
69b620336f
|
散件BOM导入
|
5 years ago |
|
qianhs
|
ca85c59cdb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
qianhs
|
20f5bfc9eb
|
wms数据同步迁移至mes
|
5 years ago |
|
王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
5 years ago |
|
陈思洁
|
59cbfbf293
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
08ec98305b
|
【1581 工位扫描-记录换模时间 -校验逻辑调整】
|
5 years ago |
|
王杰
|
b1018dbd39
|
[平台；]
|
5 years ago |
|
钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
alwaysfrin
|
f4e9a80d79
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
alwaysfrin
|
14660641ba
|
hibernate优化
|
5 years ago |
|
wei.peng
|
fa42a25b96
|
异常处理优化
|
5 years ago |
|
wei.peng
|
aa1f7a2845
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
钮海涛
|
4dee474c73
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
e0a23b147e
|
mes enum
|
5 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
5 years ago |
许心洁
|
4884f59072
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2bc62e2444
|
动态查询：#需求变更 创建用户和更新用户也需要做成可选的
|
5 years ago |
|
wynne1005
|
2e177ba671
|
dev合并test test有修改
|
5 years ago |
|
汪云昊
|
2772ea6a2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
5 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
|
wynne1005
|
581d900123
|
状态机model提交
|
5 years ago |
|
曾贞一
|
35023af12c
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
|
汪云昊
|
e7d176209e
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
64d83d238f
|
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
|
钮海涛
|
cfd3f8d58f
|
冲突解决
|
5 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
|
陈思洁
|
30608f886b
|
解决冲突
|
5 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |