WYnneaoapc
|
76149da904
|
提交
|
6 years ago |
|
WYnneaoapc
|
a1525eae8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
wei.peng
|
d495046dcf
|
添加XML 工具实现
|
6 years ago |
|
WYnneaoapc
|
18ec7d091a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
c9a572469c
|
同步限制解除
|
6 years ago |
lbwgithub
|
473e2caea0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
2cf4759c21
|
枚举
|
6 years ago |
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
 王杰
|
ddfb47e6ac
|
mes设备台账功能开发
|
6 years ago |
陈思洁
|
0bdc3592e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
f67e7df17f
|
新增冗余字段
|
6 years ago |
 曾贞一
|
28af3c27e3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
320c7f6b1f
|
【生产快速入库】生产快速入库导入接口
|
6 years ago |
汪云昊
|
de685a0627
|
删除pojo数据默认值
|
6 years ago |
|
汪云昊
|
9553e962e3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
bd55a18bf6
|
微服务接口 - 打印模板分页查询
|
6 years ago |
|
曾贞一
|
9d3b45d2e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ddd91f51b5
|
【生产快速入库】组件选择，任务编号1051
|
6 years ago |
许心洁
|
232c675444
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
d2c3045575
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
84a96a22fa
|
新加NotNumBiggerPackContainsZero方法
|
6 years ago |
|
lbwgithub
|
4477820c1b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
68b0058e1b
|
枚举
|
6 years ago |
|
许心洁
|
1b5df102e7
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
ccd04804c0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
95f156adf4
|
所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double
|
6 years ago |
陆卫豪
|
6c434e114d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
8cca6706b2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
4eada1c343
|
表同步
|
6 years ago |
|
许心洁
|
1a7b4e3438
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘辉
|
1defd0d8be
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
113bb8755d
|
解决冲突
|
6 years ago |
|
陈思洁
|
4ac7bae38b
|
新增hql
|
6 years ago |
|
bleakney.liu
|
0fa1ffa23b
|
[物流线路修改]修改数据类型
|
6 years ago |
|
bleakney.liu
|
f682d056be
|
[物流线路管理]修改查询条件
|
6 years ago |
|
许心洁
|
653c8dca1f
|
直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误
|
6 years ago |
|
WYnneaoapc
|
a11eeae45c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
7ee11674ab
|
读取托盘
|
6 years ago |
crish
|
7646e1fcfc
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
曾贞一
|
e24474fc8c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2b62357ab5
|
VDA收货【生产快速入库】组件，任务编号1051
|
6 years ago |
|
wei.peng
|
cecd37a1e7
|
添加Xml 工具
|
6 years ago |
|
许心洁
|
1d17198daf
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
9b6887dd40
|
#1050 工位监控
|
6 years ago |
|
王杰
|
72c9a5892d
|
修改注释
|
6 years ago |
|
汪云昊
|
ac1c18581e
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
d8c740819c
|
FTP适配器
|
6 years ago |
|
crish
|
01ea2f511c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
77a8cdebd5
|
安灯升级
|
6 years ago |
|
许心洁
|
61804a27b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
 钮海涛
|
16bb46df55
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
980cb2a56b
|
add product order spread to aps
|
6 years ago |
|
lbwgithub
|
ddf1d2e6dc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
5a5b7b882e
|
条码模型
|
6 years ago |
|
bleakney.liu
|
82ab39d559
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
bleakney.liu
|
4ceba7144c
|
【物流线路修改】 修改枚举值重复问题
|
6 years ago |
|
许心洁
|
10fcc569bd
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
dbb1341d6f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
e90c59ccf2
|
生产报工当查询到多条子物料时查询的SQL没有返回itemQty
|
6 years ago |
|
bleakney.liu
|
8beee972a9
|
【物流线路维护】 增加处理模式类型
|
6 years ago |
|
bleakney.liu
|
e9f82d9259
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
bleakney.liu
|
692110b92b
|
【物流线路维护】增加前端处理模式枚举
|
6 years ago |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
42a8fb357f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
82fe491bd3
|
#1050 工位监控
|
6 years ago |
|
钮海涛
|
f55e65a227
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
10ce1e165e
|
add order spread to aps
|
6 years ago |
|
lbwgithub
|
0dd15baa2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
4fc72ca358
|
条码模型
|
6 years ago |
|
crish
|
ff272afe2c
|
添加工厂条件
|
6 years ago |
|
crish
|
e0c7822803
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
864168def0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
lbwgithub
|
81d86d1bd2
|
条码模型
|
6 years ago |
|
bleakney.liu
|
4409f34e0f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
aea18f89c6
|
安灯放行说明字段维护openInfo， 安灯响应通知标识字段signSendFlag维护
|
6 years ago |
|
汪云昊
|
3ef7d24eab
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
陈思洁
|
3cc1997ae2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c2da7410eb
|
新增枚举提交
|
6 years ago |
|
crish
|
d1d813614a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
e20ee7b1ff
|
安灯放行放行说明维护， 安灯响应响应标识， 用户经过工厂过滤
|
6 years ago |
|
lbwgithub
|
ab6d6e695b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
9a21e2d99f
|
条码差异详情返回值
|
6 years ago |
|
crish
|
fe174a47ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
fb9340fc09
|
安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑
|
6 years ago |
jenkins
|
30eee05b1c
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
766d195088
|
开线合并代码
|
6 years ago |
|
WYnneaoapc
|
183fd78eac
|
冲突解决
|
6 years ago |
|
jenkins
|
99382a8fca
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
3fb2e44eaa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
c509f3c707
|
VDA 生产快速入库
|
6 years ago |
|
wei.peng
|
eb70017396
|
Xml 解析添加重试机制
|
6 years ago |
|
曾贞一
|
bc83b57f8e
|
合并代码
|
6 years ago |
|
曾贞一
|
fb86682652
|
VDA 生产快速入库
|
6 years ago |
|
jenkins
|
0982f01eb2
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
26684524f1
|
生产报工组件和生产报工标签组件提交
|
6 years ago |
|
jenkins
|
7e3edd06a0
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
3ba6508b0c
|
新增打印机配置表
|
6 years ago |
|
陈思洁
|
22fbbe2a91
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
edfc78995b
|
新增打印机配置表
|
6 years ago |
|
汪云昊
|
3b46d242a7
|
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/BlockSoftSwitchEnumUtil.java
|
6 years ago |