许心洁
|
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 |