许心洁
|
37aed24f33
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
052652dd36
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
6 years ago |
|
许心洁
|
4261207e54
|
交易处理组件（收货）：物料查询没有加工厂+流程设计：步骤调用参数值可以为空+作业处理组件：未修改不需要唯一校验
|
6 years ago |
wei.peng
|
2adff745fb
|
自定义表单 功能优化
|
6 years ago |
alwaysfrin
|
d1f4f6b25b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
10c276fb16
|
自定义数据源
|
6 years ago |
于学杰
|
b4e0effcb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
46a361a291
|
1. 增加 SAP - WMS 接口转换实体类
|
6 years ago |
刘敏
|
4cfe208bb7
|
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/bean/WmsProdCfgType.java
|
6 years ago |
|
刘敏
|
91442ec8ff
|
Wms V3新增实体创建
|
6 years ago |
|
许心洁
|
e9b1d7e595
|
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
|
6 years ago |
wei.peng
|
13af329513
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
yiming.gu
|
f349690cbb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
8a0ecfbaa9
|
新增mes查询条件
|
6 years ago |
汪云昊
|
8c4d74db52
|
解决冲突
细节优化
自定义表单功能管理 添加 是否设计字段
|
6 years ago |
陈思洁
|
767758f7a2
|
PO字段新增
|
6 years ago |
|
陈思洁
|
854cb4e106
|
项目表新增，物料表中项目字段添加
|
6 years ago |
|
于学杰
|
0d63c10182
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
4a7081f90b
|
1. 添加 SAP 中间数据库转换接口的 POJO 类
|
6 years ago |
|
wei.peng
|
db461a76ba
|
增加动态报表对外接口-多条件删除
移除默认属性校验
移除查询数据库所有表的部分字段（部分字段SQLServer不支持）
|
6 years ago |
|
wei.peng
|
c4dceace92
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
wei.peng
|
f2b19055d4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
3630f0c2f1
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
刘敏
|
df293ca8a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
94166da1ec
|
条码状态修改
|
6 years ago |
 曾贞一
|
c6bdbc73a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
4fef723bdb
|
增加移库单主表字段
|
6 years ago |
|
刘敏
|
a5caf4eab5
|
供应商退货枚举新增
|
6 years ago |
|
陈思洁
|
727c1efea8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
507902473c
|
新增业务类型枚举
|
6 years ago |
|
刘敏
|
b0faa179d1
|
报废状态从条码状态移入到质量状态中
|
6 years ago |
|
许心洁
|
32b0c5080d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
088dc7dfa4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
2b59998d16
|
新增mes-pcn同步配置基础数据
|
6 years ago |
|
许心洁
|
d7ba3d445a
|
MES数据同步-POJO调整
|
6 years ago |
|
wei.peng
|
27e4fc8ec2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
3fb500be33
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
25187ecf2c
|
存储区树型查询接口开发
|
6 years ago |
|
wei.peng
|
aec4b9a85a
|
自定义表单 多数据源 功能完成
|
6 years ago |
Silliter
|
a2d738c932
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
a39ce52aa9
|
呼叫升级和响应升级优化
|
6 years ago |
crish
|
f51f630a5f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
e874862455
|
socket动态配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
曾贞一
|
0f74a211f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
65beb8549f
|
wms存储区添加字段 是否子节点IS_SON_NODE
|
6 years ago |
|
汪云昊
|
8ea762e5df
|
细节优化
|
6 years ago |
|
汪云昊
|
e514479f00
|
细节优化
|
6 years ago |
|
许心洁
|
bdd2d05388
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
729afe8ac6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
6bb8d15ceb
|
扭矩model
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
许心洁
|
d06b6cf062
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5e46ecfe13
|
MES流程配置第一次完整测试JIT队列修改
|
6 years ago |
柯裕
|
3d3e7eaf0d
|
ANDON基础数据
|
6 years ago |
|
曾贞一
|
f53e1011a7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
33ef135392
|
采购订单表-条码明细表 字段修改 炉批号 改为 特殊批号
|
6 years ago |
|
许心洁
|
af249d70ed
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c8008c8063
|
超大的一个BUG（好惨一女的）
|
6 years ago |
|
刘敏
|
9e3a454329
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
93fa0d1aaa
|
实体字段与pdm比对添加
|
6 years ago |
|
柯裕
|
10cc2ac052
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
d081c16c61
|
安灯类型，状态，子类型，基础数据开发
|
6 years ago |
|
汪云昊
|
4cbc41a959
|
细节优化
|
6 years ago |
|
Silliter
|
98f35a5624
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
24f3b065cf
|
安灯事件现象和重要度
|
6 years ago |
|
柯裕
|
3cba9077fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
f1e8f07a90
|
新增需求：自处理
|
6 years ago |
|
许心洁
|
79cf6401a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
7ef2eb0c6e
|
报表 表单打通
|
6 years ago |
|
许心洁
|
5a044130ea
|
MES和MES-PCN产品条码PRODUCT_SN对象属性统一+WMS流程组件去工厂
|
6 years ago |
|
Silliter
|
1adcd23c6f
|
呼叫升级和响应升级优化
|
6 years ago |
|
柯裕
|
47baf16e0f
|
ANDON动作
|
6 years ago |
|
许心洁
|
58c6323a43
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
bf3c1898fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
4c8c550ba1
|
自定报表自定义表单打通
|
6 years ago |
|
许心洁
|
db722c4d5f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
ae4b32251a
|
WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】
|
6 years ago |
|
Silliter
|
5e02ce9c67
|
呼叫升级和响应升级优化
|
6 years ago |
|
Silliter
|
9c5aab7215
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
c9243ccad0
|
呼叫升级和响应升级优化
|
6 years ago |
|
陈思洁
|
e33c7c2465
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
d2fd8b428c
|
作业记录复杂查询增加时间区间查询
|
6 years ago |
|
陈思洁
|
8e7b3d61e7
|
枚举修改
|
6 years ago |
|
陈思洁
|
9d9f5a2cc2
|
抽点记录查询条件增加
|
6 years ago |
|
刘敏
|
fe7c712c51
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
27b32626b3
|
开发主动升级和启动产线业务
|
6 years ago |
|
刘敏
|
0b186e1317
|
物流路线查询修改
|
6 years ago |
|
Silliter
|
2add027acd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
b89e5c5fb9
|
呼叫升级和响应升级优化
|
6 years ago |
|
汪云昊
|
9b51768cb2
|
表单布局解决行列数量不准确
|
6 years ago |
|
crish
|
701430066e
|
事务管理
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
3a7aace277
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
1efd33975d
|
生产队列，生产计划，生产工单优化和bug修复
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
8750d8a75b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
e2247b2657
|
呼叫升级和响应升级优化
|
6 years ago |
|
曾贞一
|
fc884a24d9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
6845ef957b
|
bug #4330 工厂订单管理-订单管理 所有订单的已发布的历史记录都没有显示出来
|
6 years ago |
|
刘敏
|
0d12d3607e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
ca0a671e92
|
#4337
|
6 years ago |
|
Silliter
|
8a298687c2
|
开发andon呼叫停止产线
|
6 years ago |
|
Silliter
|
9eb6e82306
|
开发andon呼叫停止产线
|
6 years ago |
|
Silliter
|
be7545f4b5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
ee1806025c
|
开发andon呼叫停止产线
|
6 years ago |
|
yiming.gu
|
a558020d32
|
pcn新增封装查询条件sqlpack
|
6 years ago |
|
yiming.gu
|
ef09b0f41b
|
model取消对mes、andon的引用
|
6 years ago |
jiajack
|
50ee467eb6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
c8a9edab64
|
质量判定业务修改
|
6 years ago |
|
汪云昊
|
507c359067
|
平台字典优化
websocket
|
6 years ago |
|
柯裕
|
029051625e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
c9f16c701f
|
ANDON更新
|
6 years ago |
|
陈思洁
|
d3aa8e6b04
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
陈思洁
|
37dc68b858
|
修改hql语句
|
6 years ago |
|
柯裕
|
8ef8e92b95
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
022795e344
|
ANDON统计报表更新
|
6 years ago |
|
陈思洁
|
f6acf45ace
|
实体中增加乐观锁字段
|
6 years ago |
|
wei.peng
|
a34cd8a6cd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
92335a3db0
|
发布提交
|
6 years ago |
|
曾贞一
|
314641f0ae
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
c164972238
|
已发布状态的订单，不支持打印 修改
|
6 years ago |
|
jiajack
|
ebfee3d774
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
d3d25f0baa
|
Pcn节点向Mes主服务注册机制代码编写
|
6 years ago |
|
曾贞一
|
c9dd31b7ed
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
8a9e347f13
|
bug 修改
|
6 years ago |
|
crish
|
dac82b1977
|
修改报错
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
1f6eb341cd
|
修改报错
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
43c2dd4092
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
63ddfd5a53
|
MES新增基础数据查询条件
|
6 years ago |
|
曾贞一
|
6774943319
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
4e45f813dc
|
CS_ORDER_STATUS 枚举修改
DdlPreparedPack getNotInPack getNotInPackString 方法修改
|
6 years ago |
|
许心洁
|
37aa342f46
|
MES-JIT队列组件前端调试BUG
|
6 years ago |
|
许心洁
|
01d4963c57
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
6 years ago |
|
柯裕
|
7ba4c4a6e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
8aa958b902
|
ANDON统计报表更新
|
6 years ago |
|
许心洁
|
0bd995e990
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
bb14454170
|
MES—POJO实体复制+Dao层少了@Service注释+任务生成详细日志+交易处理组件：出入库：目的库位的数量累加依据改为目的质量状态
|
6 years ago |
|
柯裕
|
d60368b227
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
d62904cac7
|
ANDON统计报表更新（待改进）
|
6 years ago |
|
wei.peng
|
13c0e5afeb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
b4ca1fe409
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
a42bb71aee
|
docker配置文件修改
|
6 years ago |
|
wei.peng
|
0e79a6cdc9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
7831940c2a
|
FastDfs 添加日志
|
6 years ago |
|
许心洁
|
c99125b1a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
76e553234e
|
MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解
|
6 years ago |
|
柯裕
|
3f961e7923
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
00086912bc
|
ANDON实体更新
|
6 years ago |
|
yiming.gu
|
08d0b32ea3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
85c4f94dcb
|
MES model转移至pojo-mes目录下
|
6 years ago |
|
柯裕
|
b581cbee63
|
ANDON实体更新
|
6 years ago |
|
yiming.gu
|
78145e44e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
26fc821d1a
|
MES model修改
|
6 years ago |
|
crish
|
ce864025e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
d0840978de
|
PLC数据采集优化
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
yihang.lv
|
21c60292bf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
245596ee0b
|
sweb 导入非标准包装修改
|
6 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
6 years ago |
|
yiming.gu
|
5fc11292ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
280f9a2233
|
MES新增班次休息表、物料关键数据关系表
|
6 years ago |
|
alwaysfrin
|
41a8adcea2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
309f3f2282
|
事务调整及demo
|
6 years ago |
|
wei.peng
|
302ac8a7e8
|
初始化功能目录
|
6 years ago |
|
许心洁
|
bdff2c3e2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
8e2e1f6543
|
MES：流程配置添加工序，工步基础数据接口
|
6 years ago |
|
柯裕
|
d9b263d10c
|
ANDON_HQLPACK更新
|
6 years ago |
|
jiajack
|
550f2132e3
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java
|
6 years ago |
|
jiajack
|
21f6d4eaf8
|
PLC配置
|
6 years ago |
|
crish
|
5841ae2ed2
|
错误文件修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
623dfed52b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
090fdca183
|
MES新增客户零件关系
|
6 years ago |
|
crish
|
072bccc0e5
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
7caec34dad
|
PLC设备配置实体
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
柯裕
|
171675ffb7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
2e4f792afa
|
ANDON更新
|
6 years ago |
|
alwaysfrin
|
65b5ac3803
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
cc02090910
|
事务调整及demo
|
6 years ago |
|
alwaysfrin
|
d00c228823
|
事务调整及demo
|
6 years ago |
|
Silliter
|
05baaba8da
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
Silliter
|
630ad20587
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
crish
|
018d4a0404
|
PLC数据采集实体
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
7374fd34bb
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
e22ecf30ef
|
添加字段
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
Silliter
|
df02c5d1b2
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
yiming.gu
|
6405bcefcb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
7c7fb30e1a
|
MES新增设备查询条件
|
6 years ago |
|
yiming.gu
|
2d3cc6ea2b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
316077d263
|
MES新增工序流程工作单元对应表
|
6 years ago |
|
柯裕
|
5b041db0c9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
021e308a9e
|
ANDON实体更新
|
6 years ago |
|
Silliter
|
3111806b7b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
e31b35b6e3
|
安灯实体索引加入
|
6 years ago |
|
crish
|
7bd4ea8be9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
52d27b663b
|
扭矩采集
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
6 years ago |
|
柯裕
|
26693e107f
|
ANDON实体更新
|
6 years ago |
|
jiajack
|
564de0acdd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
9be4b8a7d0
|
工位程序业务编写
|
6 years ago |
|
yiming.gu
|
2ac8437b76
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
c60dd62f32
|
新增工步、工序、工步参数查询条件
|
6 years ago |
|
Silliter
|
251ce84d73
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
yihang.lv
|
40b0dc430e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
c5a4a5c023
|
sweb 订单按天发布
|
6 years ago |
|
Silliter
|
37a4e42a87
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
c1949e099c
|
开发安灯呼叫升级定时任务
|
6 years ago |
|
alwaysfrin
|
7edd35e688
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
c8240076bc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
7db7dee50c
|
sweb 订单发布状态取子表
|
6 years ago |
|
wei.peng
|
aafa463afc
|
添加英文的时候字段长度不够，修改字段类型
|
6 years ago |
|
柯裕
|
1d945dbc04
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
d3be2fb6df
|
ANDON更新
|
6 years ago |
|
alwaysfrin
|
4b2a19a3fb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
a8c2474397
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
刘敏
|
b90139312c
|
条码管控枚举添加
|
6 years ago |
|
Silliter
|
ad28d11486
|
安灯项目优化
|
6 years ago |
|
alwaysfrin
|
a1ccd25594
|
事务调整及demo
|
6 years ago |
|
Silliter
|
b70069e7ce
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
791d6084bc
|
安灯看板开发
|
6 years ago |
|
yiming.gu
|
2eb732c7df
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
|
6 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
6 years ago |
|
jiajack
|
2617793d0f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
83fb4ab8c0
|
工位程序业务编写
|
6 years ago |
|
柯裕
|
c1bf54f9c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
5a3e2996c7
|
findMaxByProperties更新
|
6 years ago |
|
Silliter
|
42e8c4e960
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
7d762dac6a
|
按灯系统配置开发
|
6 years ago |
|
yihang.lv
|
73330e3ba4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
458cf3610f
|
sweb 订单发布修改子表状态
|
6 years ago |
|
许心洁
|
7cce6b828f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
9a4323614c
|
流程新增与流程设计分开
|
6 years ago |
|
crish
|
8c443c3afb
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
d6221c39ae
|
生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
柯裕
|
e8238796c3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
72ac3490e4
|
ANDON枚举
|
6 years ago |
|
yihang.lv
|
256c688304
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
b4f07905e5
|
sweb 发布列表修改，按天发布
|
6 years ago |
|
Silliter
|
e2ce7c5ce9
|
物理按灯开发
|
6 years ago |
|
Silliter
|
dbfae39ea6
|
安灯项目优化
|
6 years ago |
|
柯裕
|
44e2a13ff5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
b56994fcca
|
ANDON更新
|
6 years ago |
|
Silliter
|
6b295aaace
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
8c5970d500
|
物理按灯开发
|
6 years ago |
|
柯裕
|
c161cef319
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
dfba307e43
|
ANDON_HQLPACK更新
|
6 years ago |
|
许心洁
|
e48c94caa8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
cca408fcf0
|
监控台：防止出现负库存+流程配置：流程添加POSITION字段
|
6 years ago |
|
柯裕
|
4a84e1e8ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
95789ab615
|
ANDON实体枚举更新
|
6 years ago |
|
yiming.gu
|
12e555e3a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
c7e5fc732e
|
mes组织模型菜单等级枚举修改
|
6 years ago |
|
crish
|
28caf8bf4c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |