jenkins
|
409cbb8492
|
Merge branch 'dev' into test
|
6 years ago |
许心洁
|
4a717ec544
|
直送发运JOB+交易处理程序（下线结算）逻辑变动
|
6 years ago |
|
jenkins
|
f4141fd2c6
|
Merge branch 'dev' into test
|
6 years ago |
 曾贞一
|
60feef4bb5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2240819def
|
发泡打箱包装
|
6 years ago |
刘敏
|
6e2cf70951
|
库位校验枚举添加
|
6 years ago |
|
jenkins
|
49a936c660
|
Merge branch 'dev' into test
|
6 years ago |
汪云昊
|
06bd10152c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
wei.peng
|
7f1ef0bca7
|
自定义报表表单打通， 用户在线设置功能优化
|
6 years ago |
|
汪云昊
|
d63974140d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
af2e1a811c
|
andon组织模型导入功能
andon删除关联数据校验
|
6 years ago |
|
jenkins
|
577e1372ab
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
a064c6b84a
|
枚举新增条码类型
库存条码表新增字段
|
6 years ago |
peter.pan
|
ad09180809
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c1ca7cbcae
|
Andon组织模型操作接口
Andon班次计算调整
|
6 years ago |
|
peter.pan
|
4149183450
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
c11cc65e8f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
d7b79c659c
|
WMS获取系统配置信息
|
6 years ago |
|
peter.pan
|
0526fcf05c
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
19afeb92b7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
fea0d476a4
|
基础操作,数据补全
|
6 years ago |
|
陈思洁
|
0e15934d16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
6a3662283b
|
枚举修改赋值
|
6 years ago |
|
汪云昊
|
0ed90485a6
|
安灯基础数据导入导出
|
6 years ago |
于学杰
|
4350a82043
|
1. 完善脚本引擎
|
6 years ago |
|
wei.peng
|
c858475bd2
|
用户权限调整 部门权限调整完成
|
6 years ago |
|
wei.peng
|
3a19888ddf
|
用户权限调整 岗位功能调整完成
|
6 years ago |
|
peter.pan
|
53d34096f7
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
8e39e6d9fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
0041ce328e
|
定时删除日志
|
6 years ago |
|
wei.peng
|
78cd5dc77e
|
用户权限调整
|
6 years ago |
|
peter.pan
|
d9ef2677fb
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1b1bc67c90
|
用户权限调整
|
6 years ago |
|
peter.pan
|
61ecc2a74f
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
fba99de795
|
枚举修改
|
6 years ago |
|
陈思洁
|
d47c9f8650
|
合并冲突pojo
|
6 years ago |
|
陈思洁
|
f0e0867e2c
|
库存移动pojo新增字段
|
6 years ago |
|
wei.peng
|
a1f8ca3096
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
刘敏
|
d2839f6cf2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
58b067e3cc
|
库存报表存储区级联子存储区查询
|
6 years ago |
|
peter.pan
|
5bed1d27ec
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
79b36a30a4
|
冲突合并
|
6 years ago |
|
陈思洁
|
fe3d392e9b
|
新增枚举信息
移库单明细表冗余主表临时字段
新增物料表字段
|
6 years ago |
|
peter.pan
|
f3eb8d2356
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
541b40d182
|
合并代码
|
6 years ago |
|
peter.pan
|
b39d7038fa
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
dec3743911
|
流程管家推队列查询条件没有封装
|
6 years ago |
|
wei.peng
|
2cbc082c7b
|
动态对象 空数据处理
|
6 years ago |
|
peter.pan
|
37b8755485
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
d3deaa6081
|
安灯bug解决
1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效
|
6 years ago |
|
许心洁
|
e43c493463
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
994da92b4e
|
交易处理组件：冻结全部数量；stockQuan添加getVal方法；下线扣减BUG
|
6 years ago |
|
peter.pan
|
b18d393fe0
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
e95db40c23
|
123
|
6 years ago |
|
peter.pan
|
543171dfbb
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1ac5542541
|
动态表单分页功能完成
|
6 years ago |
|
peter.pan
|
e3354f52bd
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
92daec97e3
|
枚举修改名字
|
6 years ago |
|
peter.pan
|
b8730fac47
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
ac5bf14d6b
|
动态表单动态操作 功能优化
|
6 years ago |
|
许心洁
|
15386ae5c2
|
枚举
|
6 years ago |
|
peter.pan
|
628f1db31c
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
ff9a5dcd17
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
98de08ba4a
|
文件上传优化
字段删除异常
日志添加索引
|
6 years ago |
|
peter.pan
|
96264870c2
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
efbe9dac9e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
bf02cbf8a4
|
PDA任务显示关联单据业务类型busiTypeDesc+交易处理组件：下线结算
|
6 years ago |
|
peter.pan
|
9c38ed702a
|
Merge branch 'dev' into test
|
6 years ago |
|
刘敏
|
97adebba21
|
枚举新增 实体字段新增
|
6 years ago |
|
peter.pan
|
3b1d19bbab
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
a8dee4713a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
31f6f4deef
|
枚举字段新增AMP
ASN主表、生产报工明细表新增属性
hql查询ASN主表信息
|
6 years ago |
|
刘敏
|
1b569ff3a8
|
ERP同步标识枚举添加
|
6 years ago |
|
wei.peng
|
ee5a4f1dfe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
0962b810ce
|
Json 转换精度丢失
|
6 years ago |
|
wei.peng
|
5d2695a5cb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
peter.pan
|
a551249165
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
2e5b7466c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1b4e5143aa
|
用户单帐号多平台登录
|
6 years ago |
|
许心洁
|
364efedc42
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c783d9119c
|
任务列表查询查出了状态为30的任务+流程处理组件execute方法提升事务级别+枚举添加根据枚举名查找枚举详情的静态方法
|
6 years ago |
|
peter.pan
|
49d35f264e
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
35f92b05e3
|
1. 修改ERP接口暂存表的字段，增加关联单据类型
|
6 years ago |
|
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
陈思洁
|
2ce560b39f
|
生产报工明细实体修改和枚举新增
|
6 years ago |
jenkins
|
470d319504
|
Merge branch 'dev' into test
|
6 years ago |
sky.meng
|
3cc4aec00a
|
库存预警看板
|
6 years ago |
|
sky.meng
|
2f1a3080ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
05c56e46b4
|
库存预警看板开发
|
6 years ago |
|
于学杰
|
713503d7ff
|
Merge branch 'dev' into test
|
6 years ago |
|
于学杰
|
5d1447c92a
|
1. 解决标准拣货多级存储区查找的问题
|
6 years ago |
|
许心洁
|
41324abdad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
sky.meng
|
854ee5b3cf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
6 years ago |
|
sky.meng
|
0f3d67d110
|
供应商收货看板功能完成
|
6 years ago |
|
许心洁
|
8347085f26
|
冲突
|
6 years ago |
|
许心洁
|
e3d5e5bb19
|
PDA获取任务列表+盘点冻结根据移动明细源库位更新库存
|
6 years ago |
|
wei.peng
|
eb2f61c32f
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
4309454d2a
|
邮件异常提示优化
EXCEL数据通用导出
|
6 years ago |
|
wei.peng
|
f32f7e72a2
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
shiyanghuan
|
f3151cbbe3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
shiyanghuan
|
e13d4163b7
|
库存交易报表代码提交
|
6 years ago |
|
wei.peng
|
a4016dc911
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
刘敏
|
34dcf6d526
|
枚举修改
|
6 years ago |
|
wei.peng
|
734340fe63
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
7b83985f40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
f6bf244b12
|
流程管家放MOVENO的BUG
|
6 years ago |
|
汪云昊
|
6259bd56bc
|
通用EXCEl导出MODEL
|
6 years ago |
|
jenkins
|
320910e2ae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
许心洁
|
dfef27151d
|
冲突
|
6 years ago |
|
许心洁
|
f834e91353
|
Task#764+枚举TRUE_OR_FALSE
|
6 years ago |
|
jenkins
|
32cc1db3bf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
peter.pan
|
62b2ea298b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
|
6 years ago |
|
peter.pan
|
ea83820fbf
|
新增物料类型跟单位类型
|
6 years ago |
|
许心洁
|
b3272dc3d7
|
冲突
|
6 years ago |
|
许心洁
|
fe13a43ccc
|
WmsEnumUtil冲突（几步法）
|
6 years ago |
|
jenkins
|
ea4cde868f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
陈思洁
|
fb98db0bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c08a569ac5
|
sql优化
数据权限实体增加字段
枚举增加数据权限的交易对象
|
6 years ago |
|
刘敏
|
7d0cd674cf
|
零星退料指令导入开发
|
6 years ago |
|
许心洁
|
79d1da3230
|
系统数据初始化
|
6 years ago |
|
jenkins
|
16bb8d6714
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
8e41b40196
|
excel工具类优化
|
6 years ago |
|
jenkins
|
884d4fd763
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
21746dc440
|
excel工具类优化
|
6 years ago |
|
汪云昊
|
163cb6240e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
31c347275c
|
添加重要度枚举
|
6 years ago |
|
jenkins
|
ac8b9d3986
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
b7a7eb29ae
|
安灯类型 查 表 已从表改为枚举
安灯动作 查询 表 已从表改为枚举
安灯状态 查询 已从表改为枚举 ANDON_STATUS
通知方式 查询 已从表改为枚举
重要度 查 已从表改为枚举
|
6 years ago |
|
jenkins
|
68fadff818
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
2adff745fb
|
自定义表单 功能优化
|
6 years ago |
|
wei.peng
|
0fb7e05e88
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
alwaysfrin
|
10c276fb16
|
自定义数据源
|
6 years ago |
|
jenkins
|
511df468ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
13af329513
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
jenkins
|
a58888df85
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
c4dceace92
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
jenkins
|
878108e86f
|
Merge remote-tracking branch 'origin/dev' into test
|
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 |
|
jenkins
|
0e70ff103a
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
刘敏
|
94166da1ec
|
条码状态修改
|
6 years ago |
|
汪云昊
|
c07858d5ba
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
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 |
|
jenkins
|
1a7cda72d3
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
wei.peng
|
27e4fc8ec2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jenkins
|
28ae6cf85d
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
wei.peng
|
aec4b9a85a
|
自定义表单 多数据源 功能完成
|
7 years ago |
Silliter
|
a39ce52aa9
|
呼叫升级和响应升级优化
|
7 years ago |
|
汪云昊
|
e2cfcc4c5f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
汪云昊
|
8ea762e5df
|
细节优化
|
7 years ago |
|
汪云昊
|
e514479f00
|
细节优化
|
7 years ago |
allen.zhang
|
67e3851a86
|
Merge branch 'dev' into test
|
7 years ago |
柯裕
|
10cc2ac052
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
d081c16c61
|
安灯类型，状态，子类型，基础数据开发
|
7 years ago |
|
汪云昊
|
4cbc41a959
|
细节优化
|
7 years ago |
|
柯裕
|
3cba9077fe
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
f1e8f07a90
|
新增需求：自处理
|
7 years ago |
|
wei.peng
|
7ef2eb0c6e
|
报表 表单打通
|
7 years ago |
|
allen.zhang
|
f6d70a2781
|
Merge branch 'dev' into test
|
7 years ago |
|
Silliter
|
1adcd23c6f
|
呼叫升级和响应升级优化
|
7 years ago |
|
柯裕
|
47baf16e0f
|
ANDON动作
|
7 years ago |
|
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
7 years ago |
|
Silliter
|
9c5aab7215
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
c9243ccad0
|
呼叫升级和响应升级优化
|
7 years ago |
|
陈思洁
|
e33c7c2465
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
陈思洁
|
8e7b3d61e7
|
枚举修改
|
7 years ago |
|
Silliter
|
27b32626b3
|
开发主动升级和启动产线业务
|
7 years ago |
crish
|
701430066e
|
事务管理
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
Silliter
|
ba3064d27d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
3a7aace277
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
crish
|
1efd33975d
|
生产队列，生产计划，生产工单优化和bug修复
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
Silliter
|
8a298687c2
|
开发andon呼叫停止产线
|
7 years ago |
|
Silliter
|
9eb6e82306
|
开发andon呼叫停止产线
|
7 years ago |
|
jenkins
|
fef940bcda
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
jiajack
|
c8a9edab64
|
质量判定业务修改
|
7 years ago |
|
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
7 years ago |
|
曾贞一
|
4e45f813dc
|
CS_ORDER_STATUS 枚举修改
DdlPreparedPack getNotInPack getNotInPackString 方法修改
|
7 years ago |
|
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
7 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
7 years ago |
|
Silliter
|
a42bb71aee
|
docker配置文件修改
|
7 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
7 years ago |
|
alwaysfrin
|
65b5ac3803
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
cc02090910
|
事务调整及demo
|
7 years ago |
|
Silliter
|
630ad20587
|
开发安灯呼叫升级定时任务
|
7 years ago |
|
jenkins
|
21d3c053ca
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
许心洁
|
b5696a63f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
e79987d235
|
MES流程配置接口（流程，产品流程配置）
|
7 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
刘敏
|
b90139312c
|
条码管控枚举添加
|
7 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
|
7 years ago |
|
yiming.gu
|
7c647c7844
|
1、班次pojo修改
2、andon项目新增组织模型基础数据
|
7 years ago |
|
柯裕
|
c1bf54f9c8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
5a3e2996c7
|
findMaxByProperties更新
|
7 years ago |
|
jenkins
|
7c20f070e4
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
crish
|
8c443c3afb
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
d6221c39ae
|
生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
柯裕
|
72ac3490e4
|
ANDON枚举
|
7 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
7 years ago |
|
柯裕
|
4a84e1e8ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
95789ab615
|
ANDON实体枚举更新
|
7 years ago |
|
yiming.gu
|
12e555e3a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
c7e5fc732e
|
mes组织模型菜单等级枚举修改
|
7 years ago |
|
柯裕
|
56e17f62e9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
柯裕
|
593a062e9f
|
ANDON枚举
|
7 years ago |
|
yiming.gu
|
494fc4aa70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
486dda639f
|
pcn队列pojo vin字段改为string型
|
7 years ago |
|
柯裕
|
8ccc265f0d
|
ANDON枚举更新
|
7 years ago |
|
Silliter
|
c9c470a27f
|
开发物理安灯业务
|
7 years ago |
|
Silliter
|
47bd2c0aa7
|
安灯项目开发
|
7 years ago |
|
jenkins
|
298a3c1ddf
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
许心洁
|
4cf5fbc2b7
|
#4091+流程配置复制流程+作业步骤参数，作业组件，作业组件参数，作业流程基础数据接口代码调整
|
7 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
7 years ago |
|
Silliter
|
4e9a8ab787
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
f343ea865c
|
安灯和硬件适配初始化
|
7 years ago |
|
Silliter
|
0a36f9130f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
b2c5494983
|
联调系统配置接口
|
7 years ago |
|
wei.peng
|
8e2bf96a14
|
找回丢失代码
|
7 years ago |
|
jenkins
|
12e2f1d1b8
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
许心洁
|
85a44b1baa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
许心洁
|
19f30ce4f9
|
流程配置+定时处理错误移动单给错误信息赋值过长
|
7 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
jiajack
|
d6c7e39989
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jiajack
|
038484e7ac
|
工步调度业务完善
|
7 years ago |
|
yunhao.wang
|
099a58a14d
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
yunhao.wang
|
7e8730ea9f
|
自定义按钮功能接口
消息优化
|
7 years ago |
|
Silliter
|
f8b89c930b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yiming.gu
|
a1a63c2247
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
feace14920
|
PCN同步MES主数据
|
7 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
cb628b0125
|
事务持久化调整
|
7 years ago |
|
jenkins
|
ed474fe112
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
b3f4ccbb78
|
自定义脚本开发
|
7 years ago |
|
Silliter
|
c8c8dc6750
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
yihang.lv
|
b76ccb43d2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
7da6627878
|
sweb通知公告
|
7 years ago |
|
crish
|
82de566e90
|
封装字符串>= <=查询
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
jenkins
|
4a5d0f0cb3
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
yihang.lv
|
cdd0e5fc05
|
消息接口修改
|
7 years ago |
|
Silliter
|
3d56e2539d
|
合并dev代码
|
7 years ago |
|
yunhao.wang
|
950c6dee36
|
附件来源
|
7 years ago |
|
yunhao.wang
|
eee0539562
|
sweb公告处理
|
7 years ago |
|
jenkins
|
0cde3d8a63
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
89d6ef61f4
|
盘点加
|
7 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
gragon.xu
|
186a9ccb0d
|
监控台
|
7 years ago |
|
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
a62ead1c25
|
Mes生产计划，生产工单
|
7 years ago |
|
wei.peng
|
ef109e185d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
c119c06130
|
自定义表单 使用Redis 1.0 功能完成
|
7 years ago |
|
jenkins
|
df63afecf8
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
8a69224e05
|
优化入库和质检明细处理业务
|
7 years ago |
|
gragon.xu
|
311eaf979a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
e5e0c05b9f
|
Mes生产计划开发
|
7 years ago |
|
Silliter
|
28e43c087b
|
合并dev分支代码
|
7 years ago |
|
wei.peng
|
97e992f05f
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
7 years ago |
|
gragon.xu
|
cd1c135594
|
交易处理组件isPart!=isSnControl（新增枚举取反方法）+库位新增默认状态为“空库位”
|
7 years ago |
|
yihang.lv
|
50f0a7d52a
|
新增逻辑修改
|
7 years ago |
|
yihang.lv
|
1a583f7ebb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
ce55dda367
|
确认订单目录调整
|
7 years ago |
|
Silliter
|
6cb456fcc4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
b2efdd2496
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
ab1e524f20
|
MES生产计划枚举
|
7 years ago |
|
Silliter
|
1896472e63
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
gragon.xu
|
01a5cb287b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
e20d212991
|
IS_GENERAL_TASK加上Code+DATA_STATUSCode值改为TRUE和FALSE
|
7 years ago |
|
Silliter
|
0181b0ecab
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
9418373b4d
|
DdlPack，封装bug
|
7 years ago |
|
crish
|
8678d9961e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
crish
|
e161894239
|
Mes生产计划枚举类
|
7 years ago |
|
Silliter
|
65b388d048
|
合并dev分支代码
|
7 years ago |
|
wei.peng
|
af8f8884a2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
120ea87da8
|
动态接口集成 Bug修复
|
7 years ago |
|
Silliter
|
f509514233
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
4d9b1efb69
|
MES 生产计划枚举
|
7 years ago |
|
Silliter
|
ac52608e22
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yihang.lv
|
a464028a3b
|
新增初始化
|
7 years ago |
|
yunhao.wang
|
9c54bc6f9d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
alwaysfrin
|
6960275e3b
|
DdlPack，日期封装bug
|
7 years ago |
|
alwaysfrin
|
64350cce31
|
DdlPack，日期封装bug
|
7 years ago |
|
Silliter
|
df714efc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
jessica.chen
|
887121580b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jessica.chen
|
8e5a26bc63
|
修改是否指定条码枚举
|
7 years ago |
|
wei.peng
|
15901e3fe1
|
自定义表单拦截器开发1.0完成
|
7 years ago |
|
Silliter
|
d885d6b877
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yihang.lv
|
63d0178cfd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yihang.lv
|
93f4d1cfd7
|
发布列表接口
|
7 years ago |
|
alwaysfrin
|
19b78c4148
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
bec70bc79d
|
DdlPack，数字equals添加大于0的约束
|
7 years ago |
|
jiajack
|
a7450b71fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jiajack
|
3980e05d2b
|
mes新增通用功能可配置的业务-完善
|
7 years ago |
|
alwaysfrin
|
d0cac648f3
|
添加update通过DdlPack
|
7 years ago |
|
alwaysfrin
|
b80cda2439
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
0f637fe2f7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
jimmy
|
58ec3e9323
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jimmy
|
a745015be7
|
移库单指定条码枚举
|
7 years ago |
|
yihang.lv
|
542052815b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |